Allow expect_close to be used by clients
We can do the last part of the test properly now.