Fix tests again, adjust deploy script