Backported missing RiverTests