Working on the test classes