Fix shell test harness - more complexity... yay