re-added query test