diff --git a/src/main/java/org/olat/modules/webFeed/manager/FeedFileStorge.java b/src/main/java/org/olat/modules/webFeed/manager/FeedFileStorge.java
index 7d9ff906825a46bc0ae2dc5919e073eea1bbf90b..f68232bdde99019f7d45aaaabc2ee717916b6f22 100644
--- a/src/main/java/org/olat/modules/webFeed/manager/FeedFileStorge.java
+++ b/src/main/java/org/olat/modules/webFeed/manager/FeedFileStorge.java
@@ -389,7 +389,9 @@ public class FeedFileStorge {
 			if (itemContainers != null && !itemContainers.isEmpty()) {
 				for (VFSItem itemContainer : itemContainers) {
 					Item item = loadItemFromXML((VFSContainer) itemContainer);
-					items.add(item);
+					if (item != null) {
+						items.add(item);
+					}
 				}
 			}
 		}
diff --git a/src/main/resources/database/mysql/alter_11_5_x_to_12_0_0.sql b/src/main/resources/database/mysql/alter_11_5_x_to_12_0_0.sql
index f7c4811912e23b65085331bb2e9afce5656dc196..5fb5611d9e16aa12b1b4fe9d8ee8fb2d8239971f 100644
--- a/src/main/resources/database/mysql/alter_11_5_x_to_12_0_0.sql
+++ b/src/main/resources/database/mysql/alter_11_5_x_to_12_0_0.sql
@@ -5,7 +5,6 @@ create table o_feed (
    lastmodified datetime not null,
    f_resourceable_id bigint,
    f_resourceable_type varchar(64),
-   f_type varchar(20),
    f_title varchar(1024),
    f_description varchar(1024),
    f_author varchar(255),
diff --git a/src/main/resources/database/mysql/setupDatabase.sql b/src/main/resources/database/mysql/setupDatabase.sql
index 0312702aa9dfe0de75c5bd12064cf8347b18386f..2759c5d7d9d7f9a8d603f0dbbfe35b196b8f1a65 100644
--- a/src/main/resources/database/mysql/setupDatabase.sql
+++ b/src/main/resources/database/mysql/setupDatabase.sql
@@ -1928,7 +1928,6 @@ create table o_feed (
    lastmodified datetime not null,
    f_resourceable_id bigint,
    f_resourceable_type varchar(64),
-   f_type varchar(20),
    f_title varchar(1024),
    f_description varchar(1024),
    f_author varchar(255),
diff --git a/src/test/java/org/olat/modules/webFeed/manager/FeedFileStorgeTest.java b/src/test/java/org/olat/modules/webFeed/manager/FeedFileStorgeTest.java
index 8cc7e6b177ecf8e6075fe3c1f65a27cd35a900f0..2c1749aaf5ea078b6bb8426502cd1227c204544c 100644
--- a/src/test/java/org/olat/modules/webFeed/manager/FeedFileStorgeTest.java
+++ b/src/test/java/org/olat/modules/webFeed/manager/FeedFileStorgeTest.java
@@ -606,6 +606,27 @@ public class FeedFileStorgeTest extends OlatTestCase {
 		fileResourceManager.deleteFileResource(resource);
 	}
 	
+	@Test
+	public void loadItemsFromXML_missing_XML() {
+		BlogFileResource resource = new BlogFileResource();
+		Feed feed = new FeedImpl(resource);
+		Item item1 = new ItemImpl(feed);
+		String guid1 = "guid 1";
+		item1.setGuid(guid1);
+		sut.saveItemAsXML(item1);
+		Item item2 = new ItemImpl(feed);
+		String guid2 = "guid 2";
+		item2.setGuid(guid2);
+		sut.saveItemAsXML(item2);
+		sut.deleteItemXML(item1);
+		
+		List<Item> items = sut.loadItemsFromXML(feed);
+		
+		assertThat(items.size()).isEqualTo(1);
+		
+		fileResourceManager.deleteFileResource(resource);
+	}
+	
 	@Test
 	public void loadItemsFromXML_empty() {
 		BlogFileResource resource = new BlogFileResource();
diff --git a/src/test/java/org/olat/restapi/RepositoryEntriesTest.java b/src/test/java/org/olat/restapi/RepositoryEntriesTest.java
index c4edcdfe00e882d9c3d582f31fbc529b2b09ea29..09cab67241dc08768c1976dc040b37180bd254e7 100644
--- a/src/test/java/org/olat/restapi/RepositoryEntriesTest.java
+++ b/src/test/java/org/olat/restapi/RepositoryEntriesTest.java
@@ -56,7 +56,6 @@ import org.apache.http.util.EntityUtils;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.type.TypeReference;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.olat.admin.securitygroup.gui.IdentitiesAddEvent;
 import org.olat.basesecurity.BaseSecurity;
@@ -419,7 +418,6 @@ public class RepositoryEntriesTest extends OlatJerseyTestCase {
 	}
 	
 	@Test
-	@Ignore
 	public void testImportBlog() throws IOException, URISyntaxException {
 		URL cpUrl = RepositoryEntriesTest.class.getResource("blog-demo.zip");
 		assertNotNull(cpUrl);
diff --git a/src/test/java/org/olat/test/AllTestsJunit4.java b/src/test/java/org/olat/test/AllTestsJunit4.java
index 1693c395a3d93c5945b356e496f0331020cfe692..24491434053daa6d818a4147d81a92614294dc15 100644
--- a/src/test/java/org/olat/test/AllTestsJunit4.java
+++ b/src/test/java/org/olat/test/AllTestsJunit4.java
@@ -182,7 +182,6 @@ import org.junit.runners.Suite;
 	org.olat.modules.webFeed.manager.FeedDAOTest.class,
 	org.olat.modules.webFeed.manager.ItemDAOTest.class,
 	org.olat.modules.webFeed.manager.FeedFileStorgeTest.class,
-	org.olat.modules.webFeed.manager.FeedManagerImplTest.class,
 	org.olat.properties.PropertyTest.class,
 	org.olat.search.service.document.file.FileDocumentFactoryTest.class,
 	org.olat.search.service.indexer.repository.course.SPCourseNodeIndexerTest.class,
@@ -222,7 +221,6 @@ import org.junit.runners.Suite;
 	org.olat.ims.qti21.model.xml.OpenOLATAssessementItemsTest.class,
 	org.olat.ims.qti21.model.xml.QTI21ExplorerHandlerTest.class,
 	org.olat.ims.lti.LTIManagerTest.class,
-	org.olat.modules.webFeed.manager.FeedManagerImplTest.class,
 	org.olat.modules.qpool.manager.MetadataConverterHelperTest.class,
 	org.olat.modules.qpool.manager.QuestionDAOTest.class,
 	org.olat.modules.qpool.manager.FileStorageTest.class,
@@ -311,7 +309,9 @@ import org.junit.runners.Suite;
 	/**
 	 * Pure JUnit test without need of framework
 	 */
+	org.olat.modules.card2brain.manager.Card2BrainManagerImplTest.class,
 	org.olat.modules.fo.WordCountTest.class,
+	org.olat.modules.webFeed.manager.FeedManagerImplTest.class,
 	org.olat.modules.webFeed.manager.RomeFeedFetcherTest.class,
 	/**
 	 *