[#1682] clean up test code