Backporting signal handling while "sleeping" from #352

plus removing those duplicate tests I meant to clean up in `v2.5-stable`