Updated doc & unit tests