Minor fix for: Errors when running ContextWithModuleTest - TRUNK-2543