Merge "Added tests for FilteredNumAsyncQueryHandler" into nyc-dev