test cases && events bugfix