url,url_test.py: Simplifies bracket removal. Adds more bracket testing.