Improved Query test stability in case of server errors.