Added a receiver and unit test