* Resolve merge conflicts * Remove cruft from local exploration * Move integration tests to intercept using new abstraction layer instead of channel * Fix linter error after rebase
* Resolve merge conflicts * Remove cruft from local exploration * Move integration tests to intercept using new abstraction layer instead of channel * Fix linter error after rebase