continuing refactoring

* continue refactoring how things are injected in integration tests