Fixing tests...