Change URL and fix tests