Added the event testing and bug fixes.

Change-Id: I7eb71fd2d423706c7387d3d08a8b8cc420609775
Signed-off-by: dekehn <dekehn@gmail.com>