- Fixed the test classes