Fix failing tests.  Had fallen out of sync with actual UI code.