Fix waterfall links and add another test

Waterfall links were broken by a previous commit (as mentioned in issue #25). Also added another flow sample since it was useful for testing and we need more tests (issue #13)