Fix tests
Fix conflicts