Merge "Limit tests should pass correct image and flavor"