Fix test cases, spread the object love through ModuleInfo