Add mocha members and comment existing used interface
Merge