Merge "Expand Pip rotate tests"