moved the test cases from the main methods of classes into test classes. Still have to implement all the tests appropriately