Don't retrieve extras from bundle when they aren't explicitly put there.
Test database isn't working now.
Zip importer nullchecks input file path.