trying to fix tests again...