Add handling of multi line imports
Better handling of incomplete source files
Updated test data for multi line imports
Fix minor code indentation