events fixed and tested

Change-Id: Ic6183c9e0ef885dd980815b4fa15f08d8f61b318
mbeans works

Change-Id: I8a55fa0ed219fb8b49a8992f88629d7b76cc685d