polished failing tests
Fixed merge errors