removed old unneccessary test case
negligible edits
Separated import job to outside module