Updated doc and tests