More options allowed for full_uri
Re-work some testing