Extend content api test helpers to support options

* Extend `#content_api_has_artefacts_with_a_tag` to take a options hash.
This allows the interface to be flexible enough for a wider range of
testing situations, i.e. artefacts in a specific format.
This changes formats which were different in their examples to be the same when invoked with options.  Which is correct for the actual data?