Merge "Create new test group to split the tests"