Refactore; Create tests for ModuleController