proper import and fixes for test cases