Replace diag() with note() in rest.t