Migrated more unit tests to OCaml