Don't encode the same argument over and  over.
update a few tests