refactored some tests, expanded Alarm aggregate and test