Added listener tests