Refactored all tests to be hosted in memory / using http client