Converted remaining tests to use OCaml driver