Resolved test conflict