Follow-up from "Merge instance stats queries"

The following discussion from !45885 (merged) should be addressed:

• @mlunoe started a discussion:

  Suggestion (might be beyond scope for this MR): It would be great if these tests actually tested multiple queries since we rely on it working that way. However, I am not entirely sure on the impact of the tests here, so this can be pushed out.