Merge "Cleanup some support test classes"