Fixing tests (again)