Fixing tests maybe