Fix various integration tests

See detailed description in each individual commit for more info.
need to keep this public and deprecate it for one cycle.  we have downstream projects which use this method.  will do an emergency patch.