Change to grouped timeseries, fix tests of graphs