Charon: remove debug spew
TestCharon: add some more tests