Revive merge tests