Adding test coverage via grunt mocha
Merge branch 'master' into aws