Now all the tests should work :)