diff --git a/java/idea-ui/src/com/intellij/jar/BuildJarSettings.java b/java/idea-ui/src/com/intellij/jar/BuildJarSettings.java
index da6d2c9c7146..db38ded64cc8 100644
--- a/java/idea-ui/src/com/intellij/jar/BuildJarSettings.java
+++ b/java/idea-ui/src/com/intellij/jar/BuildJarSettings.java
@@ -27,7 +27,10 @@ import org.jetbrains.annotations.NotNull;
  * @author cdr
  */
 public class BuildJarSettings implements ModuleComponent, JDOMExternalizable {
-  @NonNls private static final String ELEMENT_CONTAINERINFO = "containerInfo";
+  @NonNls public static final String ELEMENT_CONTAINER_INFO = "containerInfo";
+  @NonNls public static final String BUILD_JAR_SETTINGS_COMPONENT_NAME = "BuildJarSettings";
+  @NonNls public static final String JAR_URL_ATTRIBUTE = "jarUrl";
+  @NonNls public static final String MAIN_CLASS_ATTRIBUTE = "mainClass";
   private final PackagingConfiguration myPackagingConfiguration;
   private final Module myModule;
   private String myJarUrl = "";
@@ -51,11 +54,11 @@ public class BuildJarSettings implements ModuleComponent, JDOMExternalizable {
   }
 
   public void readExternal(Element element) throws InvalidDataException {
-    Element settings = element.getChild(ELEMENT_CONTAINERINFO);
+    Element settings = element.getChild(ELEMENT_CONTAINER_INFO);
     if (settings != null) {
       myPackagingConfiguration.readExternal(settings);
     }
-    myJarUrl = JDOMExternalizer.readString(element, "jarUrl");
+    myJarUrl = JDOMExternalizer.readString(element, JAR_URL_ATTRIBUTE);
     if (myJarUrl == null) {
       final String jarPath = JDOMExternalizer.readString(element, "jarPath");
       if (jarPath != null) {
@@ -63,17 +66,17 @@ public class BuildJarSettings implements ModuleComponent, JDOMExternalizable {
       }
     }
     myBuildJar = JDOMExternalizer.readBoolean(element, "buildJar");
-    myMainClass = JDOMExternalizer.readString(element, "mainClass");
+    myMainClass = JDOMExternalizer.readString(element, MAIN_CLASS_ATTRIBUTE);
   }
 
   public void writeExternal(Element element) throws WriteExternalException {
     if (!myBuildJar) throw new WriteExternalException();
-    Element settings = new Element(ELEMENT_CONTAINERINFO);
+    Element settings = new Element(ELEMENT_CONTAINER_INFO);
     element.addContent(settings);
     myPackagingConfiguration.writeExternal(settings);
-    JDOMExternalizer.write(element, "jarUrl", myJarUrl);
+    JDOMExternalizer.write(element, JAR_URL_ATTRIBUTE, myJarUrl);
     JDOMExternalizer.write(element, "buildJar", myBuildJar);
-    JDOMExternalizer.write(element, "mainClass", myMainClass);
+    JDOMExternalizer.write(element, MAIN_CLASS_ATTRIBUTE, myMainClass);
   }
 
   public PackagingConfiguration getPackagingConfiguration() {
@@ -101,7 +104,7 @@ public class BuildJarSettings implements ModuleComponent, JDOMExternalizable {
 
   @NonNls @NotNull
   public String getComponentName() {
-    return "BuildJarSettings";
+    return BUILD_JAR_SETTINGS_COMPONENT_NAME;
   }
 
   public void initComponent() {
diff --git a/platform/lang-impl/src/com/intellij/conversion/impl/ConversionContextImpl.java b/platform/lang-impl/src/com/intellij/conversion/impl/ConversionContextImpl.java
index 33b890a6e5a4..91d911a2b8f9 100644
--- a/platform/lang-impl/src/com/intellij/conversion/impl/ConversionContextImpl.java
+++ b/platform/lang-impl/src/com/intellij/conversion/impl/ConversionContextImpl.java
@@ -6,16 +6,17 @@ import com.intellij.conversion.*;
 import com.intellij.ide.highlighter.ProjectFileType;
 import com.intellij.ide.highlighter.WorkspaceFileType;
 import com.intellij.ide.impl.convert.JDomConvertingUtil;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.components.ExpandMacroToPathMap;
 import com.intellij.openapi.components.StorageScheme;
 import com.intellij.openapi.module.impl.ModuleManagerImpl;
-import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.roots.impl.libraries.LibraryImpl;
+import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar;
 import com.intellij.openapi.util.Condition;
+import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar;
-import com.intellij.openapi.roots.impl.libraries.LibraryImpl;
-import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.util.PathUtil;
 import org.jdom.Element;
@@ -23,8 +24,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.FileFilter;
+import java.io.IOException;
 import java.util.*;
 
 /**
@@ -63,7 +64,10 @@ public class ConversionContextImpl implements ConversionContext {
     }
 
     myModuleFiles = findModuleFiles(JDomConvertingUtil.loadDocument(modulesFile).getRootElement());
-
+    if (ApplicationManager.getApplication().isUnitTestMode()) {
+      System.out.println("myStorageScheme = " + myStorageScheme);
+      System.out.println("myModuleFiles = " + Arrays.toString(myModuleFiles));
+    }
   }
 
   @NotNull