Hardening 392 unit test (query)