some changes to make test notifications work