Many changes to support integration testing