Fixed mocha
TODO assertions etc.
Version 0.8.7