Use builder where possible.
Duplicate test.
Notification test.
Notification feed tests.
Merge remote-tracking branch 'origin/master' into develop