Correct watershed hierarchy tests

7 jobs for !124 with development/fix-canonization in 20 minutes and 5 seconds (queued for 4 seconds)
merge request