Cleanup in the field tests