Another test for #26 and a fix (at least for the problems with the new test

Avoid NPE if there is no xmlElementOriginalAnnotation use fieldName and
namespace of candidate instead