renamed mocha to test
refacttored handlebar templates and helpers