changed mocha default timeout to 3000 and removed "//CHANGED" comments