Update and un-xfail auto-encode test

Closes #6122