Some adjustments to get shell handlers executing

although black box tests are still borked.  Looking...
A few more tweaks to get us back in the green :smiley_cat: