Ok, then I'd vote to revert the test and its classes to the original state for the time being to keep the change focused.