Adjust scripts for test(1) operator -a removal
Cherry-pick master commit of: e9019e324a7fddaf82e4b6d3926083859ba14ff8
See