Updated tests for new query items