Removed mocha testing, small optimisations
Testing removed until further notice