Fix selector for watch notifications +remove xfail