some more unit test fixes
more tests work