unit test fixes

There were 9 failures in the unit tests that were fairly straight forward to fix.