Re-write shingle query test to reflect new query