Updated chartest to reflect file locations
Merge branch 'master' into events