Fixes charting and updates the test rules to produce more useful charts.