[54492332] More changes to the awk and test scripts