Tests have been adapted for the new encoding stuff