Fix tests
Fix last tests.