Fixing tests a bit