Switched to new Time/Alarm, instead of AlarmTime. Cleaned up a bit. New tests.