Merge "Testing that alarm cap is enforced"