Fix up test for changes in copy_plaintext
Tidy up some comments, remove an unused import