Improved testing on YesNoCancel