Migrate to urlify
Updated tests