New charts + tests.