AddedImportRepositoryTest and minor changes