smoketests-fixed