added support for different urls
fixed tests