Bugfix in .module. Test updated // mockup added