Merge "Convert UtfNormalTest into a PHPUnit test"