First version of UI tests
Merge branch 'feature/UItesting'