Fix tests again