tests passing for expanding queries