Fixing smoke tests I broke as part of UHM-808