Cleaned up test classes.