4947979514
This improves the recording of events from the client. In the tests change the alarm to a string to better match what is actually returned (the alarm_id). Change-Id: I4c577c3eafdadae20912dea2ff584a9e358b171c