Docblock tweaks
Update tests