RemoteRiverTest unit test patched to reflect refactorings