Fix some tests
Fix more test
Fix tests