Remove invalid tests
Correct context check
Quick fix for account notification settings