Parameterize the tests to allow easier debugging and simplify the logic in the test itself.

Merged Philip Elson requested to merge feature/pytest-param into master

Follows on from review in !21 (merged).

Merge request reports