1 files changed, 2 insertions, 40 deletions
diff --git a/Test.hs b/Test.hs
index 040bb87..835bd89 100644
--- a/Test.hs
+++ b/Test.hs
@@ -2,50 +2,12 @@ import Test.HUnit
 import Library.Command
 import Library.TypeVar
 import Library.Term
-import LibraryTheorem
+import Library.Theorem
+import Test.DataTypes
 import qualified Data.Set as Set
 
 
 
-stdName :: String -> Name
-stdName s = Name [] s 
-
-stdType :: Type
-stdType = AType [] (TypeOp (stdName "atype"))
-
-stdConst :: Const
-stdConst = Const (stdName "const")
-
-stdConstTerm :: Term
-stdConstTerm = TConst stdConst stdType
-
-stdTypeVarName :: Name
-stdTypeVarName = stdName "typevar"
-
-altTypeVarName :: Name
-altTypeVarName = stdName "alttypevar"
-
-stdTypeVar :: Type
-stdTypeVar = TypeVar stdTypeVarName
-
-altTypeVar :: Type
-altTypeVar = TypeVar altTypeVarName
-
-stdVar :: String -> Var
-stdVar s = Var (stdName s) stdTypeVar
-
-stdVarTerm :: String -> Term
-stdVarTerm s = TVar (stdVar s)
-
-altVar :: String -> Var
-altVar s = Var (stdName s) altTypeVar
-
-altVarTerm :: String -> Term
-altVarTerm s = TVar (altVar s)
-
-
-
-
 name1 = TestCase (assertEqual "for (name \"abc\")" 
 	                          (Just (Name [] "abc"))
 	                          (name "\"abc\""))