[refactorTimeScale] Fixed previous commit typos and test separation
[refactorTimeScale] Fixed previous commit typos and test separation

RobertoMalatesta/plottable,NextTuesday/plottable,softwords/plottable,danmane/plottable,iobeam/plottable,jacqt/plottable,NextTuesday/plottable,iobeam/plottable,danmane/plottable,palantir/plottable,RobertoMalatesta/plottable,softwords/plottable,palantir/plottable,palantir/plottable,softwords/plottable,iobeam/plottable,RobertoMalatesta/plottable,palantir/plottable,NextTuesday/plottable,jacqt/plottable,danmane/plottable,jacqt/plottable