Added Unit tests
Added UI tests