Refactor user flow tests and added helpers

Fixes #10