Merge "Avoid conflicts with other tests instances"