Trying to fix tests ...