Improve error handling and logging
Add test client template variables for url verification