Merge "Fix PipRotation tests"