amending the unless on the exec for quoting also
modified tests