Fixed 3 failing Mocha test. Code was commetend out.