Refactoring test fixtures