Update specs to use new helper syntax.
Use the (working) v2 API.