Fix smoke tests