Refactor tests for transition events