Refactoring  of the put process step. Plus some additional tests.