Fixed URL tests for both 2.1 and 2.0