Updating query tests to reflect the 'state of the art'