Merge "Refactor random url generation into its own method"