Fixed up unit tests.  (They are still crap.)