Cleaned up the test classes.