diff --git a/reactor/Test/Test.iml b/reactor/Test/Test.iml
index 363bf2d9..61320fd4 100644
--- a/reactor/Test/Test.iml
+++ b/reactor/Test/Test.iml
@@ -21,6 +21,7 @@
     <orderEntry type="module" module-name="API" />
     <orderEntry type="module" module-name="unification-lib" />
     <orderEntry type="module" module-name="Core" />
+    <orderEntry type="module" module-name="tests" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.1-2" level="project" />
diff --git a/reactor/Test/pom.xml b/reactor/Test/pom.xml
index 6f90891c..2620fb81 100644
--- a/reactor/Test/pom.xml
+++ b/reactor/Test/pom.xml
@@ -25,6 +25,11 @@
             <artifactId>memreactor-core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>jetbrains.mps.logic.memreactor</groupId>
+            <artifactId>unification-tests</artifactId>
+            <version>${unification.version}</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/reactor/unification/tests/pom.xml b/reactor/unification/tests/pom.xml
index 2f7b0cc1..9fafaba7 100644
--- a/reactor/unification/tests/pom.xml
+++ b/reactor/unification/tests/pom.xml
@@ -13,6 +13,7 @@
 
     <artifactId>unification-tests</artifactId>
     <packaging>jar</packaging>
+    <version>1.0.2</version>
 
     <dependencies>
         <dependency>
@@ -29,7 +30,8 @@
     </dependencies>
 
     <build>
-        <testSourceDirectory>${basedir}/src/</testSourceDirectory>
+        <testSourceDirectory>${basedir}/test/</testSourceDirectory>
+        <sourceDirectory>${basedir}/src/</sourceDirectory>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/reactor/unification/tests/src/jetbrains/mps/unification/test/MockTermsParser.java b/reactor/unification/tests/src/jetbrains/mps/unification/test/MockTermsParser.java
index 99f52049..d0bd061e 100644
--- a/reactor/unification/tests/src/jetbrains/mps/unification/test/MockTermsParser.java
+++ b/reactor/unification/tests/src/jetbrains/mps/unification/test/MockTermsParser.java
@@ -199,7 +199,7 @@ public class MockTermsParser {
         private void emptyTerm() {
             String name = termsStack.pop();
             Integer label = termLabelsStack.pop();
-            Term newTerm = term(name);
+            Term newTerm = MockTerm.term(name);
             argumentsStack.peek().add(newTerm);
             if (label != null) {
                 termRefs.put(label, newTerm);
@@ -214,7 +214,7 @@ public class MockTermsParser {
             List<Term> arguments = argumentsStack.pop();
             String name = termsStack.pop();
             Integer label = termLabelsStack.pop();
-            Term newTerm = term(name, arguments.toArray(new Term[arguments.size()]));
+            Term newTerm = MockTerm.term(name, arguments.toArray(new Term[arguments.size()]));
             argumentsStack.peek().add(newTerm);
             if (label != null) {
                 termRefs.put(label, newTerm);
@@ -222,21 +222,21 @@ public class MockTermsParser {
         }
 
         private void addVar(String name) {
-            argumentsStack.peek().add(var(name));
+            argumentsStack.peek().add(MockTerm.var(name));
         }
 
         private void addVarRef(String name) {
-            argumentsStack.peek().add(ref(var(name)));
+            argumentsStack.peek().add(MockTerm.ref(MockTerm.var(name)));
         }
 
         private void addRef(String ref) {
             final int label = Integer.parseInt(ref.substring(1));
             if (termRefs.containsKey(label) && termRefs.get(label) != null) {
-                argumentsStack.peek().add(ref(termRefs.get(label)));
+                argumentsStack.peek().add(MockTerm.ref(termRefs.get(label)));
             }
             else {
                 termRefs.put(label, null);
-                argumentsStack.peek().add(ref(lookupHelper.lookup(label)));
+                argumentsStack.peek().add(MockTerm.ref(lookupHelper.lookup(label)));
             }
         }
     }
diff --git a/reactor/unification/tests/src/jetbrains/mps/unification/test/AssertAll.java b/reactor/unification/tests/test/jetbrains/mps/unification/test/AssertAll.java
similarity index 100%
rename from reactor/unification/tests/src/jetbrains/mps/unification/test/AssertAll.java
rename to reactor/unification/tests/test/jetbrains/mps/unification/test/AssertAll.java
diff --git a/reactor/unification/tests/src/jetbrains/mps/unification/test/AssertStructurallyEquivalent.java b/reactor/unification/tests/test/jetbrains/mps/unification/test/AssertStructurallyEquivalent.java
similarity index 100%
rename from reactor/unification/tests/src/jetbrains/mps/unification/test/AssertStructurallyEquivalent.java
rename to reactor/unification/tests/test/jetbrains/mps/unification/test/AssertStructurallyEquivalent.java
diff --git a/reactor/unification/tests/src/jetbrains/mps/unification/test/AssertUnification.java b/reactor/unification/tests/test/jetbrains/mps/unification/test/AssertUnification.java
similarity index 100%
rename from reactor/unification/tests/src/jetbrains/mps/unification/test/AssertUnification.java
rename to reactor/unification/tests/test/jetbrains/mps/unification/test/AssertUnification.java
diff --git a/reactor/unification/tests/src/jetbrains/mps/unification/test/ParserTests.java b/reactor/unification/tests/test/jetbrains/mps/unification/test/ParserTests.java
similarity index 100%
rename from reactor/unification/tests/src/jetbrains/mps/unification/test/ParserTests.java
rename to reactor/unification/tests/test/jetbrains/mps/unification/test/ParserTests.java
diff --git a/reactor/unification/tests/src/jetbrains/mps/unification/test/SolverTests.java b/reactor/unification/tests/test/jetbrains/mps/unification/test/SolverTests.java
similarity index 100%
rename from reactor/unification/tests/src/jetbrains/mps/unification/test/SolverTests.java
rename to reactor/unification/tests/test/jetbrains/mps/unification/test/SolverTests.java
diff --git a/reactor/unification/tests/tests.iml b/reactor/unification/tests/tests.iml
index fc97d13d..6b676004 100644
--- a/reactor/unification/tests/tests.iml
+++ b/reactor/unification/tests/tests.iml
@@ -4,7 +4,8 @@
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />