some test refactoring