CONN-1045 Test and DS G0 Event annotation added

Last piece of 1045.