Make unit tests pass after UI changes