Tweak some tests
Better handling of special URLs