Fixing tests (3)