Fixing encoding tests (that actually didn't validate results)