adding a few tests
adding few tests and resolved conflict
removing errors