Another attempt to get integration test passing