Fixed more failing integration tests