refactorig test classes