Fix tests
Fix some tests.