more attempts at cleaning up smoke tests