Merge "Correct sendBroadcast test" into pi-dev