Removed Testcase dependence.