Fixes charting and updates the test rules to produce more useful charts.
Merge pull request #265 from jsight/chartingfixes

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