Fix UI tests broken by recent commits
Spec out tests for recent changes