Fix doc
Add test and fix river stop