Rewrote logger as a decroator
Added logging to alarm test
Removing unnecessary super calls
Re-enabling alarm tests
Merge branch 'master' into logging
Revert "Added logging to alarm test"

This reverts commit e9fd977933634a57224bf08f6c8c0482469b2913.