Cleanup tests for new UI.  Part 1.