More tests fixed

src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs

@@ -18,7 +18,7 @@ namespace Umbraco.Tests.PublishedContent
 
 		protected override DatabaseBehavior DatabaseTestBehavior
 		{
-			get { return DatabaseBehavior.NewDbFileAndSchemaPerFixture; }
+			get { return DatabaseBehavior.NewSchemaPerFixture; }
 		}
 
 		[SetUp]

src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs

@@ -214,7 +214,9 @@ namespace Umbraco.Tests.TestHelpers
 
             if (_isFirstRunInTestSession
                 || DatabaseTestBehavior == DatabaseBehavior.NewSchemaPerTest
-                || (_isFirstTestInFixture && DatabaseTestBehavior == DatabaseBehavior.NewSchemaPerFixture))
+                || DatabaseTestBehavior == DatabaseBehavior.NewDbFileAndSchemaPerTest
+                || (_isFirstTestInFixture && DatabaseTestBehavior == DatabaseBehavior.NewSchemaPerFixture)
+                || (_isFirstTestInFixture && DatabaseTestBehavior == DatabaseBehavior.NewDbFileAndSchemaPerFixture))
             {
                 //Create the umbraco database and its base data
                 DatabaseContext.Database.CreateDatabaseSchema(false);

src/Umbraco.Tests/TestHelpers/BaseWebTest.cs

@@ -78,4 +78,4 @@ namespace Umbraco.Tests.TestHelpers
         }
 
     }
-}
+}

src/Umbraco.Web/PublishedContentExtensions.cs

@@ -611,7 +611,7 @@ namespace Umbraco.Web
 		{
 			var contentTypeService = UmbracoContext.Current.Application.Services.ContentTypeService;
 			var type = contentTypeService.GetContentType(content.DocumentTypeAlias);
-			while (type.ParentId > 0)
+			while (type != null && type.ParentId > 0)
 			{
 				type = contentTypeService.GetContentType(type.ParentId);
 				if (type.Alias.InvariantEquals(docTypeAlias))