added more alarm classes and tests