Stop repeating content in tests

[jeremy-code]

Not a fan of the way tests are handled, too much repeated content and everything should be consolidated somewhere.