Added Unit Tests & Dynamic generated Charts