Fix some tests
Fix tests