additional test and doc update