Fixes for tests in user flow branch