Adds code coverage, etc
Back to mocha.
Merge pull request #10 from noblesamurai/integrate_changes_from_dscape

Integrate changes from dscape's PR.