Fixed a bug in the charting, and changed the order in all method tests.