Fixing some bad encoding, updating a test file, correcting some error logging