Fixed up address url
Fixed up tests