* Documentation improvements

* improve test suite
