Minor changes to smoke tests.