I added the revisions you asked me. I am not sure how successful the rebase -i was. I added KGpgChangeTrust tests. One of which(changing trust to ultimate) is failing because of the previous bug.