Fix incorrect parsing of cpuid in optable.xml

This fixes issue #65, and also included are minor updates to some
test operand cases.