Still more test refactoring