Tweak some exit status tests