Added a bunch more strictness to the tests, and removed a few bits of
old charting code that are no longer relevant.