[wip] spec refactor
get those spec passing
remove notification helper requirement for now