Updated testsuite for encoding