Complete flow options and add test case