a ton of more work making the tests work