Adding FakeHTTP and improving test coverage