improved imports for deprecated Assert in test cases