Topic/fix ui tests

This fixes my ui tests, ran 'em locally.