Added support for server_url
Added unit tests