modifying tests for new classes