Fixed tests. updated OCamlMakefile