1) Made the toString methods output better in unify.js
2) Fixed a unit test so that it does not depend on toString