Fixed serious issue in waterfall logic, added some more tests