Merge "Back-migrate new test cases"