Merge "Change tests to adapt alarm spliting"