spec test; refactor listener notfications