Add chart unit tests for #706 and #743

This pull request has no new code. I merged #706 and #743 together and added tests. These new tests require both sets of changes to pass. 

@rgrove 
This acts a replacement for #706 and #743 with tests added.