Try to fix broken tests
Merge