Decompose route handler into two steps.
Improve integration tests.