Added tests to confirm single call of remove event.

Change-Id: I8a2ccc5c353ef8ef2d9aaa7f02237b48e3600089