Trying to fix tests