Easier to test when not in the big flow
More tests