refactor URLs
fix signature URL resolution test