Fixing tests a bit.