A bit of test refactoring