NH-3251: Fixed the last two discriminator test failures.