Get in-place tests working "properly"
Ensure that an encoding error handler's result is safe

--HG--
extra : amend_source : c4036e7a53a663f37b2379806739b48c65a9c014