fixing the pumping,updating test
merge due to conflict