Fix some tests
Fix some tests