Rework smoke tests