Fixing tests....