Added river support and basic integration test (not working yet - is the river working ?)