Fix encoding issues, now with actual testing