server, plugin test cleanup