Allow for repeating segment query syntax
Fix tests broken by change in error message