Add mfr.PACKAGE_DIR constant
Add <module> argument
Move core mfr tests outside of package