HCOLL-219 improved the test coverage and implementation of import and export