Can you make a separate PR please?

I must admit that I have some problem (or not enough time) understanding your tests, I would have been much easier without that custom encoding.