Fix stop and unset-env tests