Fix some tests
Fix more tests