Added UI tests
merge with typos