Structural changes to the tests