Adding UI unit tests
Fixing settings usage in UI
Merge pull request #297 from zobalogh/ui-caller-delivery

Adding UI unit tests
Merge remote-tracking branch 'upstream/master' into storage-interface-dev