Create client event handler infrastructure for testing

Change-Id: Icbe0ba1313134456420bdaeeaa7aacda98a006f1