Fix up alarm and pvcalarm tests