#579 updated removed query tests