diff --git a/src/passes/operators/operators.ml b/src/passes/operators/operators.ml
index 1842b620d..15ed4928a 100644
--- a/src/passes/operators/operators.ml
+++ b/src/passes/operators/operators.ml
@@ -103,20 +103,9 @@ module Simplify = struct
   module Camligo = struct
     let constants = [
       ("Bytes.pack" , "PACK") ;
-
-      ("Map.remove" , "MAP_REMOVE") ;
-      ("Map.update" , "MAP_UPDATE") ;
-      ("Map.add"    , "MAP_ADD") ;
-      ("Map.mem"    , "MAP_MEM") ;
-      ("Map.find"   , "MAP_FIND") ;
-      ("Map.fold"   , "MAP_FOLD") ;
-      ("Map.map"    , "MAP_MAP") ;
-
       ("Crypto.hash" , "HASH") ;
-
       ("Operation.transaction" , "CALL") ;
       ("Operation.get_contract" , "CONTRACT") ;
-
       ("sender" , "SENDER") ;
       ("unit" , "UNIT") ;
       ("source" , "SOURCE") ;
@@ -715,13 +704,6 @@ module Compiler = struct
     ("MAP_FIND_OPT" , simple_binary @@ prim I_GET) ;
     ("MAP_ADD" , simple_ternary @@ seq [dip (i_some) ; prim I_UPDATE]) ;
     ("MAP_UPDATE" , simple_ternary @@ prim I_UPDATE) ;
-    (* ("GET_CONTRACT" , simple_constant @@ prim I_CONTRACT) ; *)
-    (* ( "MAP_REMOVE"   , simple_binary @@ seq [prim I_NONE TODO: + annotation ; prim I_UPDATE ]) ; *)
-    ( "MAP_MEM"         , simple_binary @@ prim I_MEM) ;
-    (* ( "MAP_FOLD"     , simple_ternary @@ prim TODO I_ITER?) ; *)
-    ( "MAP_MAP"         , simple_binary @@ prim I_MAP) ;
-    (* ( "MAP_MAP_FOLD" , simple_ternary @@ prim TODO I_ITER?) ; *)
-    (* ( "MAP_ITER"     , simple_binary @@ prim TODO I_ITER?) ; *)
     ("SIZE" , simple_unary @@ prim I_SIZE) ;
     ("FAILWITH" , simple_unary @@ prim I_FAILWITH) ;
     ("ASSERT_INFERRED" , simple_binary @@ i_if (seq [i_failwith]) (seq [i_drop ; i_push_unit])) ;
diff --git a/src/contracts/condition-annot.mligo b/src/test/contracts/condition-annot.mligo
similarity index 100%
rename from src/contracts/condition-annot.mligo
rename to src/test/contracts/condition-annot.mligo
diff --git a/src/contracts/condition-shadowing.mligo b/src/test/contracts/condition-shadowing.mligo
similarity index 100%
rename from src/contracts/condition-shadowing.mligo
rename to src/test/contracts/condition-shadowing.mligo
diff --git a/src/contracts/condition.mligo b/src/test/contracts/condition.mligo
similarity index 100%
rename from src/contracts/condition.mligo
rename to src/test/contracts/condition.mligo
diff --git a/src/contracts/fibo.mligo b/src/test/contracts/fibo.mligo
similarity index 100%
rename from src/contracts/fibo.mligo
rename to src/test/contracts/fibo.mligo
diff --git a/src/contracts/fibo2.mligo b/src/test/contracts/fibo2.mligo
similarity index 100%
rename from src/contracts/fibo2.mligo
rename to src/test/contracts/fibo2.mligo
diff --git a/src/contracts/fibo3.mligo b/src/test/contracts/fibo3.mligo
similarity index 100%
rename from src/contracts/fibo3.mligo
rename to src/test/contracts/fibo3.mligo
diff --git a/src/contracts/fibo4.mligo b/src/test/contracts/fibo4.mligo
similarity index 100%
rename from src/contracts/fibo4.mligo
rename to src/test/contracts/fibo4.mligo
diff --git a/src/contracts/for_fail.ligo b/src/test/contracts/for_fail.ligo
similarity index 100%
rename from src/contracts/for_fail.ligo
rename to src/test/contracts/for_fail.ligo
diff --git a/src/contracts/incr_decr.mligo b/src/test/contracts/incr_decr.mligo
similarity index 100%
rename from src/contracts/incr_decr.mligo
rename to src/test/contracts/incr_decr.mligo
diff --git a/src/contracts/procedure.ligo b/src/test/contracts/procedure.ligo
similarity index 100%
rename from src/contracts/procedure.ligo
rename to src/test/contracts/procedure.ligo
diff --git a/src/contracts/website2.mligo b/src/test/contracts/website2.mligo
similarity index 100%
rename from src/contracts/website2.mligo
rename to src/test/contracts/website2.mligo