Refactor the upgrade tests to make add_criterion simpler.

Lots of AT criteria had different options, so it was better to let the caller set the non-standard options.