Working with Denis to get integration tests to pass