Make changes to Drop* infrastructure and build system to make the TestModule work properly.