Merge "Adding debug logs for Test event emitter" into main