Fixing tests

And so begins the journey to fix all the tests...