Updated tests to use httptest server