tabulate unit tests coming along
refactored out IterableQuery