Added more coverage for notify & scroll