Fix UI test regressions.
Fix UI test regressions.

I'm not sure why these tests worked before and don't now, but I don't
think it represents a real regression in our UI, but rather exposed a
timing issue in our UI tests

maurizi/otm-core,maurizi/otm-core,maurizi/otm-core,maurizi/otm-core