cleaned up, and provided mocha files