Added Unit tests
Added unit Tests