Merge "Move car service test cases to original package"