- more unit tests for watershed
- fixed bug in watershed
- minor tweaks