Made a couple of tweaks to the support for test blocking