Lazy initialization of listener stores
Improve tests