Added more tests and cleaned up Test class