Test & doc update