Ui Tests merged with master

Signed-off-by: sjaindl <jaindl.stefan@gmail.com>