UI TESTS
Merge pull request #215 from pachalad/master

UI TESTS