Wip/test fixes2

More test fixes