remove -e from grep and use fgrep instead of grep -F in testall
Merge pull request #1827 from MatthewCattell/harmonise-grep-fgre-egrep-testall

remove -e from grep and use fgrep instead of grep -F in testall