UI TESTS
Merge pull request #214 from pachalad/master

UI TESTS