Fixing all the tests I broke :-)