Serious test case refactoring.