Variable name refactoring
Dropping simple mocha dependency
Merge pull request #450 from codingtwinky/master

Variable name refactoring
Merge pull request #452 from codingtwinky/drop_simple_mocha

Dropping simple mocha dependency