Fix smoketests