Added UI tests