reverted events back to bubbling, fixed the tests to compensate