Improve ModuleTestCase