changelist master
refactorig test classes