Charting is working with new object type
Add unit tests for charts