ModuleOptions added, testing fix