Some UT additions / update for diag, services & pkt