Remove annotate_event_with_state as nothing was using it. Update state tests to call annotate_context_with_state