#734 - clean up test code