Ignored UI tests
Fixed merge conflicts