Fixed test cases due to removal of mode-independent events.