Merge "Fix some additional tests registering real receivers" into udc-dev