fix tests - refactor missed test classes