Modified two tests to match extended server error message
added backwards-compat check to queries for ResourceGroup