Added Unit tests