Enable OCaml solver for testing
Added underscore escaping style