Completed most of the charts and added tests