Merge "Move notification service tests to be ui services tests"