Merge "Remove problematic TestSuite classes"