CMS-2191 Design for Module system.
Fixed unit test.