fix some tests for the new encoding support