Implement url generation
Fix whitespaces
Update tests