Fix tests
Merged