Handle case of Image with no Fileset and add integration test