Need to segregate mocha and karma
Updates to testing