Tweak of NULL value test variants for monitoring so we actually get NULL's vs 'None' (string value)