Fix tests
Merge conflict