fixed tests on update_notifications
Merge branch 'testing' into develop

Conflicts:
	test/unit/update_notifications.js