Rework test case to remove possible sources of error -- client is leaking.