Made tests more black-box; we don't care what order the listeners are added/removed in, just that they are added/removed.