Cleanup logging
replaceAtSync
update mocha,should