Simplify test setup

Reduces a lot of duplication in the test setup and makes it
simpler to add new tests to the suite.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

Author: sgallagher