Remove test for removed listener dict, add more coverage