Fix and improve the chart tests