I think we should just move this into the testcase file