bug 1064468: updates model script output to reflect updated re/decommission scripts
bug 1068807: additional logging and more useful naming in model tests