[Style] Minor fixes
[Style] Updare rubocop configuration
[Bundle] Add explicit dependency on mocha
[Style] Minor fixes 2