Rewrite tests to use parameterized patterns where possible

[jackdewinter]

Note: Long term effort, collection issue to track this work as things move over where possible.

This is a result of #750 where we looked at how we are testing and started to tighten things up. #750