Playing with Mocha a bit
Updating for easier testing.