Fix more tests
More test fixes