reorder methods in AbstractFsRiverTest and extract default values