duh.  Put the alarm creation in the right test :P
Merge remote-tracking branch 'origin/1.10' into 1.12