Update tests
Ensure unique filenames for structured imports, see #85
Merge remote-tracking branch 'upstream/master'