Removed unused classes from earlier tests.