Added awaitable listener and test