Clean up urls
Fix account tests