amend test files
amend conflict in notifier test