Add capability announce enforcement test and fixup some other result filessince the role capability is now shown in more cases.