Surround define arguments with double quotes

To allow whitesapce in string deinfed values
Update a little testing code