Add URL values and refactor tests