Fixed #472
Fixed #473
Fixed #469
Fixed #474
Fixed #477
Fixed #478 and added tests
Fixed #479
Added alarm test data for 4.4.4