Again: Fix test suite encoding problems

Closes #57