Fixed: issues that came up when parsing the test multi-line script files