Simplified the test classes.