Added tests for rivers, and fixed a problem with how effects for rivers were being placed