Revert broken testCaseIds use