Modify regex to allow any valid queue name
Modify spec to cover naming conventions