More charts test coverage.
Merge branch 'moretests' into dev-3.x

More charts unit tests.