Fix up test utils cleanup