unify class tests
refactor tests