diff --git a/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj b/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj
index 92f79c80837b72944b4d0ea4fdc9a4ca530fb7a7..e4d06c7c65ba6ca64748bfd3e29cf02cc89660dc 100644
--- a/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj
+++ b/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj
@@ -146,14 +146,13 @@
-
+
-
diff --git a/src/Compilers/CSharp/Test/Emit/Emit/EmitMetadata.cs b/src/Compilers/CSharp/Test/Emit/Emit/EmitMetadataTests.cs
similarity index 100%
rename from src/Compilers/CSharp/Test/Emit/Emit/EmitMetadata.cs
rename to src/Compilers/CSharp/Test/Emit/Emit/EmitMetadataTests.cs
diff --git a/src/Compilers/CSharp/Test/Emit/Emit/OutputStreams.cs b/src/Compilers/CSharp/Test/Emit/Emit/OutputStreams.cs
deleted file mode 100644
index 674fd11abe81b6173b478c92bdd532764d2b3b10..0000000000000000000000000000000000000000
--- a/src/Compilers/CSharp/Test/Emit/Emit/OutputStreams.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.IO;
-using Microsoft.CodeAnalysis.CSharp.Symbols;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Text;
-
-namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Emit
-{
- internal class NameResolver
- {
- public string GetDebugInformationFileName(SyntaxTree syntaxTree)
- {
- throw new NotImplementedException();
- }
-
- public Stream GetXmlInclude(SyntaxTree syntaxTree, string xmlIncludeFile)
- {
- throw new NotImplementedException();
- }
- }
-}
diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/FieldTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/FieldTests.cs
index e729fb6704689630fbad792272eb90f314658a72..47674b58aca6af06da8da369753ecbd7fc7965fc 100644
--- a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/FieldTests.cs
+++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/FieldTests.cs
@@ -483,7 +483,7 @@ static System.Action