Update documentation
Update tests