improve test module support