Zomg fix the tests!