[RICPLT-1528] xApp Mock improvements...