src/CleanArchitecture.Core/Interfaces/ISeedData.cs

+using System.Collections.Generic;
+using CleanArchitecture.Core.SharedKernel;
+
+namespace CleanArchitecture.Core.Interfaces
+{
+
+    public interface ISeedData
+    {
+        void PopulateTestData();
+    }
+}
\ No newline at end of file

src/CleanArchitecture.Core/SharedKernel/ValueObject.cs

@@ -31,9 +31,9 @@ namespace CleanArchitecture.Core.SharedKernel
             return !(obj1 == obj2);
         }
 
-        public bool Equals(ValueObject obj)
+        public bool Equals(ValueObject other)
         {
-            return Equals(obj as object);
+            return Equals(other as object);
         }
 
         public override bool Equals(object obj)

src/CleanArchitecture.Web/SeedData.cs → src/CleanArchitecture.Infrastructure/Data/SeedData.cs

 using CleanArchitecture.Core.Entities;
-using CleanArchitecture.Infrastructure.Data;
 
-namespace CleanArchitecture.Web
+namespace CleanArchitecture.Infrastructure.Data
 {
-    public static class SeedData
+    public class SeedData
     {
-        public static void PopulateTestData(AppDbContext dbContext)
+        private readonly AppDbContext _dbContext;
+
+        public SeedData(AppDbContext dbContext)
+        {
+            _dbContext = dbContext;
+        }
+        public void PopulateTestData()
         {
-            var toDos = dbContext.ToDoItems;
+            var toDos = _dbContext.ToDoItems;
             foreach (var item in toDos)
             {
-                dbContext.Remove(item);
+                _dbContext.Remove(item);
             }
-            dbContext.SaveChanges();
-            dbContext.ToDoItems.Add(new ToDoItem()
+            _dbContext.SaveChanges();
+            _dbContext.ToDoItems.Add(new ToDoItem()
             {
                 Title = "Test Item 1",
                 Description = "Test Description One"
             });
-            dbContext.ToDoItems.Add(new ToDoItem()
+            _dbContext.ToDoItems.Add(new ToDoItem()
             {
                 Title = "Test Item 2",
                 Description = "Test Description Two"
             });
-            dbContext.SaveChanges();
+            _dbContext.SaveChanges();
         }
 
     }

src/CleanArchitecture.Infrastructure/InfrastructureRegistry.cs

+using CleanArchitecture.Core.Interfaces;
+using CleanArchitecture.Infrastructure.Data;
+using StructureMap;
+
+namespace CleanArchitecture.Infrastructure
+{
+    public class InfrastructureRegistry : Registry
+    {
+        public InfrastructureRegistry()
+        {
+            For(typeof(IRepository<>)).Add(typeof(EfRepository<>));
+        }
+    }
+}

src/CleanArchitecture.Web/CleanArchitecture.Web.csproj

@@ -19,7 +19,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\CleanArchitecture.Core\CleanArchitecture.Core.csproj" />
-    <ProjectReference Include="..\CleanArchitecture.Infrastructure\CleanArchitecture.Infrastructure.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -27,6 +26,7 @@
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0" PrivateAssets="All" />
+    <PackageReference Include="StructureMap.Microsoft.DependencyInjection" Version="1.4.0" />
   </ItemGroup>
 
   <ItemGroup>

src/CleanArchitecture.Web/Startup.cs

@@ -38,17 +38,15 @@ namespace CleanArchitecture.Web
             {
                 config.Scan(_ =>
                 {
-                    _.AssemblyContainingType(typeof(Startup)); // Web
-                    _.AssemblyContainingType(typeof(BaseEntity)); // Core
-                    _.Assembly("CleanArchitecture.Infrastructure"); // Infrastructure
+                    _.AssembliesAndExecutablesFromApplicationBaseDirectory();
+                    //_.AssemblyContainingType(typeof(Startup)); // Web
+                    //_.AssemblyContainingType(typeof(BaseEntity)); // Core
+                    //_.Assembly("CleanArchitecture.Infrastructure"); // Infrastructure
                     _.WithDefaultConventions();
                     _.ConnectImplementationsToTypesClosing(typeof(IHandle<>));
+                    _.LookForRegistries();
                 });
 
-                // TODO: Add Registry Classes to eliminate reference to Infrastructure
-
-                // TODO: Move to Infrastucture Registry
-                config.For(typeof(IRepository<>)).Add(typeof(EfRepository<>));
 
                 //Populate the container using the service collection
                 config.Populate(services);
@@ -59,7 +57,8 @@ namespace CleanArchitecture.Web
 
         public void ConfigureTesting(IApplicationBuilder app,
             IHostingEnvironment env,
-            ILoggerFactory loggerFactory)
+            ILoggerFactory loggerFactory,
+            ISeedData seedData)
         {
             this.Configure(app, env, loggerFactory);
             SeedData.PopulateTestData(app.ApplicationServices.GetService<AppDbContext>());

tests/CleanArchitecture.Tests/Integration/Data/EfRepositoryShould.cs

@@ -26,7 +26,7 @@ namespace CleanArchitecture.Tests.Integration.Data
             // Create a new options instance telling the context to use an
             // InMemory database and the new service provider.
             var builder = new DbContextOptionsBuilder<AppDbContext>();
-            builder.UseInMemoryDatabase()
+            builder.UseInMemoryDatabase(Guid.NewGuid().ToString())
                    .UseInternalServiceProvider(serviceProvider);
 
             return builder.Options;