UHM-169 - Fixing smoke tests after switching to simple form UI