Correct test data path.
Better multiline code handling in console.
Merge remote-tracking branch 'origin/master'