Url generator trait
Tests for url generator trait
Merge branch 'feature/url-generator-trait' into develop