Addint tests and fixes for encoding + characters in script calls.