Big refactoring of query chunking to make it easier to strip out nulls
Fixed the null that comes back in eventually consistent queries with deleted items
Cleaned up some test code