adapts the code for mocha testing and adapts mocha testing file to the new structure
resolve conflicts and ignore netbeans folder