Modified tests
Fixed merge and modified the tests