Provide extension mechanism for UI tests
Fix broken UI tests
Merge pull request #762 from ahinz/fix/ui-tests

Fix/ui tests