Add tests and HttpClient