Fix broken smoke tests