Refactor the test a bit

Less one off classes in the global scope and more open structs.

Way more open structs.