Update documentation
Fix unit tests
Complete unit tests