Added more tests to each test class.