minor cleanup
#673 - clean up test env