fixed testspan
Merge branch 'next_query_test' into next_query_testspan