Fixed failing integration tests