Fixing a few things

Author: Jake Ginnivan

TestStack.ConventionTests.Tests/MvcConventions.api_controller_conventions.approved.txt

@@ -1,11 +1,10 @@
-Failed: 'Api Controllers must be suffixed with Controller' for 'TestAssembly'
------------------------------------------------------------------------------
+'Api Controllers must be suffixed with Controller' for 'TestAssembly'
+---------------------------------------------------------------------
 
 	TestAssembly.Controllers.BarApiControler
 
-
-Failed: 'Types named *Controller must inherit from ApiController or Controller' for 'TestAssembly'
---------------------------------------------------------------------------------------------------
+'Types named *Controller must inherit from ApiController or Controller' for 'TestAssembly'
+------------------------------------------------------------------------------------------
 
 	TestAssembly.Controllers.TestApiController
-	TestAssembly.Controllers.TestController
+	TestAssembly.Controllers.TestController

TestStack.ConventionTests.Tests/MvcConventions.controller_conventions.approved.txt

@@ -1,11 +1,10 @@
-Failed: 'Mvc Controllers must be suffixed with Controller' for 'TestAssembly'
------------------------------------------------------------------------------
+'Mvc Controllers must be suffixed with Controller' for 'TestAssembly'
+---------------------------------------------------------------------
 
 	TestAssembly.Controllers.FooControler
 
-
-Failed: 'Types named *Controller must inherit from ApiController or Controller' for 'TestAssembly'
---------------------------------------------------------------------------------------------------
+'Types named *Controller must inherit from ApiController or Controller' for 'TestAssembly'
+------------------------------------------------------------------------------------------
 
 	TestAssembly.Controllers.TestApiController
-	TestAssembly.Controllers.TestController
+	TestAssembly.Controllers.TestController

TestStack.ConventionTests.Tests/MvcConventions.cs

@@ -15,7 +15,7 @@ public class MvcConventions
         public void controller_conventions()
         {
             var types = Types.InAssemblyOf<TestController>();
-            var convention = new MvcControllerConvention();
+            var convention = new MvcControllerNameAndBaseClassConvention();
 
             var ex = Assert.Throws<ConventionFailedException>(() => Convention.Is(convention, types));
             Approvals.Verify(ex.Message);

TestStack.ConventionTests/ConventionData/Types.cs

@@ -1,7 +1,6 @@
 namespace TestStack.ConventionTests.ConventionData
 {
     using System;
-    using System.Collections;
     using System.Collections.Generic;
     using System.Linq;