AS7-6843 Fix global modules and add test case