Start of reworking Caml comment tests