Correct the unit tests for System.normalize/locate