Adapted other modules to new test product