Got rid of all test methods and unnecessary imports across all classes, module 1 complete