Doc updates
Fixed unit tests