improve collect module and import test case