Merge "Move remaining tests over to using NotificationEntryBuilder"