Fix unit tests
More unit test fixes