Crud for rivers with tests