Edited the integration tests
Fixed merge conflicts