more test refactoring