Fixing the tests a bit.