mostly updates for running smoke tests