Starting to work on the other test classes