test fixes, including towards getting interrupt-on-cancel testing to
work