fixed tests, encoding issues