Fix tests again..