updated tests for simplified flow