Merge "Fix AlarmManagerServiceTest and add some more tests"