Use httptest recorder
LIttle bit of refactor + format