unit-test-module clean up