Simplify notication existence check, fix tests