RMG improvements
Map river test as default