Better handling of incomplete source files
Updated test data for multi line imports