Add "grid" testing, change report format to be easier in sorting
Include query time