make it take urls w/o http or https
rearrange and add a bit to tests