Further cleanup of test classes