Doc work
Update tests