Fix notification tests.
Merge branch 'next' into gpu