Fix URLs and tests