BS-9380: rewrite integration test as 3 unitary query tests