Fix unit tests and docs
Improve docs