Unit test fixes

Yay!

These are trivial fixes in the tests.