Fixing merge tests