Remove custom testcases classes and adpat tests.