Enough people are making use of sidecar that we need to add a CI test to make sure we have some coverage with this mode. This add a couple small functional test fixes found wtih enabling sidecar tests as well.
