refactoring
refactoring
refactoring
extra test - resuming after the shipper restart