Fixed git diff by @MatAlcDev left in, re-added shell_flag. Better test comments