add more waterfall unit tests