Changes in unit tests
Fixed doc generation