Fix notification related test chunks