Add tests and Url class