Attempt to fix tests