Merge "Clean up TestCaseUtil"