Improve the CloseEvent tests.