Futher fixes for import test cases