Refactor url generation & add more specs
Refactor & rename