Revert shellscript grammar change and add more tests