And still more test refactoring