Merge "clean up invalid_multibyte test"