River functionality now merged in, with sane tests