Update ModuleSubsystem instantiation to allow unit tests to pass.