Cleanup imports re test cases.