ChartTests refactor