Test improvements from https://github.com/ckan/ckanext-qa/pull/8/files