Merge "Clean up verifier testcases."