Improve river integration spec