master: Fixing url links, test