Merge "Remove group validator from UnitTestCase"