Clean up test classes.

@bug W-2142877@

@rev tbliss@
@P4CL: 8789320@
Merging origin/goliver/master-pending-test-cleanup into master