fixed notification e2e framework: added && conditions where needed