moved patch to correct block
finalized tests