Merge "Refactor and add test flows"