Fixing tests (yet again)