Simplified listener tests.
Removed interceptor. Save listener state on static variables.