Copy tests from ecf606cb and replace 'or' with 'xor' / 'and'. This provides coverage for an enhancement of D120516 / acb96ffd