Added test classes to refactor the test code