More test code refactoring