Update tests and clean up internal listeners