Fixing tests AGAIN