Advanced submodule
Changed template pattern (test)