added new test classes and tried to refine test stubs