Supporting 'group by time(0.1s) & fixing tests