Update documentation
Refactoring unit tests