Refactoring test file organization (again).