Fix tests again!