improvements to unittestmodule