Add notifications helper and fix test helper