tidy tests up a bit and allow more than one listener to be added at once