Revert "NXDRIVE-107: Fix the test to avoid query"

This reverts commit 0cd45edc245680a9d629341ea74d098d1e37d6c3.