ocaml-expect -> expect (cf #3068)
ocaml-mad -> mad (cf #3068)