Migrated more unit tests to OCaml
Removed unused code