Unit test fixes

a couple minor unit test fixes