updated criterion tests