Pump: add tests fom previous commit