Test fixes and improvements for notifications