Fixing tests.. again :)