Continuing to try and get integration tests working