Added some additional tests for flow building