AWDSPonza - cleaned up test code