Simplify looking for any matches in a set
Give more helpful feedback when the assertion fails

Telling you what was found is better than telling you it wasn't found with what
you asked for.
Remove redundant include statements

This module is included in the superclass already.
Merge pull request #96 from alphagov/refactor_some_test_helpers

Tweak test code