fix an test
more tests
Fix remaining tests