Attempting to fix tests again.