Better cleanup after publish test