Finished getting the integration tests working.  Ugly but quick and minimal changes required.