more tests and some (ugly) rewrites...

unify is not as elegant as it used to be--uglied it up to get conso to pass tests. can certainly be made more elegant than it is now, but at least the test passes ...