Fixed unit tests.  Not optimal by any means