Doc and unit tests improvements