fixed failing integration tests