Fixed urls and failing tests