Merge "Test case updated with alarm history api"