Added test
Added quoted support to optional parameters