Adapt tests again