this is the actual change to the tests, the rest is just cleanup code