Add two-step-submission
Add tests for two-step-submission