Fix storage tests after notification patch merging

Also small refactoring for notification staff was made

Change-Id: If38173fba9e5c2847ea9d8f8d4123e49f152d27a
Merge "Fix storage tests after notification patch merging"