diff --git a/Makefile b/Makefile
index e647329a..8bafa272 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ clean:
 	@dune clean
 
 test:
-	@dune runtest
+	@dune runtest --force --no-buffer
 
 TESTOPTS ?= -j $(J)
 TESTTOOL=logitest
@@ -51,7 +51,7 @@ reindent: ocp-indent
 	@find src '(' -name '*.ml' -or -name '*.mli' ')' -print0 | xargs -0 echo "reindenting: "
 	@find src '(' -name '*.ml' -or -name '*.mli' ')' -print0 | xargs -0 ocp-indent -i
 
-WATCH=@install
+WATCH=@all
 watch:
 	@dune build $(WATCH) -w
 	#@dune build @all -w # TODO: once tests pass
diff --git a/sidekick.opam b/sidekick.opam
index 5fafc69b..a14b0001 100644
--- a/sidekick.opam
+++ b/sidekick.opam
@@ -8,7 +8,7 @@ maintainer: ["simon.cruanes.2007@m4x.org"]
 build: [
   ["dune" "build" "@install" "-p" name "-j" jobs]
   ["dune" "build" "@doc" "-p" name "-j" jobs ] {with-doc}
-  # ["dune" "runtest" "-p" name] {with-test}
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 depends: [
   "dune" {build}
@@ -16,6 +16,7 @@ depends: [
   "iter"
   "msat" { >= "0.8" < "0.9" }
   "ocaml" { >= "4.03" } 
+  "alcotest" {with-test}
 ]
 tags: [ "sat" "smt" ]
 homepage: "https://github.com/c-cube/sidekick"
diff --git a/src/mini-cc/tests/dune b/src/mini-cc/tests/dune
new file mode 100644
index 00000000..dea37b2f
--- /dev/null
+++ b/src/mini-cc/tests/dune
@@ -0,0 +1,4 @@
+(tests
+ (names tests)
+ (libraries sidekick.mini-cc sidekick.base-term alcotest)
+ (modes native))
diff --git a/src/mini-cc/tests/tests.ml b/src/mini-cc/tests/tests.ml
new file mode 100644
index 00000000..a0fe63c4
--- /dev/null
+++ b/src/mini-cc/tests/tests.ml
@@ -0,0 +1,84 @@
+open Sidekick_util
+
+open Sidekick_base_term
+
+module A = Alcotest
+module CC = Sidekick_mini_cc.Make(struct
+  module T = Sidekick_base_term.Arg
+  let cc_view = Term.cc_view
+end)
+
+module Setup() = struct
+  let tst = Term.create()
+  let (@->) l ret = Ty.Fun.mk l ret
+  let ty_i = Ty.atomic_uninterpreted (ID.make "$i")
+  let ty_bool = Ty.bool
+
+  let fun_f = Fun.mk_undef (ID.make "f") ([ty_i] @-> ty_i)
+  let fun_g = Fun.mk_undef (ID.make "g") ([ty_i; ty_i] @-> ty_i)
+  let fun_p = Fun.mk_undef (ID.make "p") ([ty_i] @-> ty_bool)
+  let fun_a = Fun.mk_undef_const (ID.make "a") ty_i
+  let fun_b = Fun.mk_undef_const (ID.make "b") ty_i
+  let fun_c = Fun.mk_undef_const (ID.make "c") ty_i
+
+  let true_ = Term.true_ tst
+  let false_ = Term.false_ tst
+  let const c = Term.const tst c
+  let app_a f l = Term.app_fun tst f l
+  let app_l f l = Term.app_fun tst f (IArray.of_list l)
+  let not_ x = Term.not_ tst x
+  let eq a b = Term.eq tst a b
+  let neq a b = Term.not_ tst (eq a b)
+  let a = const fun_a
+  let b = const fun_b
+  let c = const fun_c
+  let f t1 = app_l fun_f [t1]
+  let g t1 t2 = app_l fun_g [t1;t2]
+  let p t1 = app_l fun_p [t1]
+end
+
+let l = ref []
+let mk_test name f =
+  l := (name, `Quick, f) :: !l
+
+let () = mk_test "test_p_a_b" @@ fun () ->
+  let module S = Setup() in
+  let cc = CC.create S.tst in
+  CC.add_lit cc S.(p a) true;
+  CC.add_lit cc S.(p b) false;
+  A.(check bool) "is-sat" (CC.check_sat cc) true;
+  CC.add_lit cc S.(eq a b) true;
+  A.(check bool) "is-unsat" (CC.check_sat cc) false;
+  ()
+
+let () = mk_test "test_p_a_b_2" @@ fun () ->
+  let module S = Setup() in
+  let cc = CC.create S.tst in
+  CC.add_lit cc S.(p a) true;
+  CC.add_lit cc S.(not_ @@ p b) true;
+  A.(check bool) "is-sat" (CC.check_sat cc) true;
+  CC.add_lit cc S.(eq a b) true;
+  A.(check bool) "is-unsat" (CC.check_sat cc) false;
+  ()
+
+let () = mk_test "test_f_f_f_a" @@ fun () ->
+  let module S = Setup() in
+  let cc = CC.create S.tst in
+  CC.add_lit cc S.(neq a (f (f (f (f (f (f a))))))) true;
+  A.(check bool) "is-sat" (CC.check_sat cc) true;
+  CC.add_lit cc S.(eq a (f a)) true;
+  A.(check bool) "is-unsat" (CC.check_sat cc) false;
+  ()
+
+let () = mk_test "test_trans" @@ fun () ->
+  let module S = Setup() in
+  let cc = CC.create S.tst in
+  CC.add_lit cc S.(eq a b) true;
+  CC.add_lit cc S.(eq b c) true;
+  A.(check bool) "is-sat" (CC.check_sat cc) true;
+  CC.add_lit cc S.(neq (f a) (f c)) true;
+  A.(check bool) "is-unsat" (CC.check_sat cc) false;
+  ()
+
+(* run alcotest *)
+let () = Alcotest.run "mini-cc-tests" ["mini-cc", List.rev !l]