simplify tests post refactoring