Overkill refactoring of all test cases