Increase number of integration tests

Although we have pretty decent unit test coverage, we still have issues which slip through due when hitting real world client-server interactions. It seems like it's more efficient to invest in integration tests to capture these issues. We have fairly low coverage there.