Trying to fix tests but no success