Better mismatch notification coverage - cleanup