Remove all listeners before running next test

This leaves the multi-watch tests as they were, but it makes the others consistent with regard to removing listeners.