Mocha tests
Fully tested
Deleting old tests
Readability