Fix tests
Fix more tests