[0/2] sh.test adjustments

[Peter Rosin]

Hi!

Since I tripped up and made sh.test fail, to repent I'd thought I'd
move the test to the new testsuite. But then I noticed a bug, so it
turned into a two patch series...

Ok to push?

Cheers,
Peter