Fixed test and and chart data generation.