Add PACKAGE_MODULE_DIR
Add test support