diff --git a/.gitignore b/.gitignore
index 0e4c1d7..33dd0da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,9 @@
 .builds
 *.dotCover
 
+# Ignore Visual Studio Code files
+.vscode/
+
 ## TODO: If you have NuGet Package Restore enabled, uncomment this
 packages/
 
diff --git a/src/IF.Lastfm.Core.Old.Tests/Api/Commands/Artist/GetInfoCommandTests.cs b/src/IF.Lastfm.Core.Old.Tests/Api/Commands/Artist/GetInfoCommandTests.cs
index 79a196b..3d21837 100644
--- a/src/IF.Lastfm.Core.Old.Tests/Api/Commands/Artist/GetInfoCommandTests.cs
+++ b/src/IF.Lastfm.Core.Old.Tests/Api/Commands/Artist/GetInfoCommandTests.cs
@@ -113,7 +113,9 @@ public async Task HandleSuccessResponse()
                 }
             };
 
-            var response = CreateResponseMessage(Encoding.UTF8.GetString(ArtistApiResponses.ArtistGetInfoSuccess));
+            var file = GetFileContents("ArtistApi.ArtistGetInfoSucess");
+            var response = CreateResponseMessage(Encoding.UTF8.GetString(file));
+            //var response = CreateResponseMessage(Encoding.UTF8.GetString(ArtistApiResponses.ArtistGetInfoSucess));
             var parsed = await _command.HandleResponse(response);
 
             Assert.IsTrue(parsed.Success);
@@ -127,7 +129,8 @@ public async Task HandleSuccessResponse()
         [Test]
         public async Task HandleErrorResponse()
         {
-            var response = CreateResponseMessage(Encoding.UTF8.GetString(ArtistApiResponses.ArtistGetInfoMissing));
+            var response = CreateResponseMessage(GetResource("ArtistApiResponses.ArtistGetInfoMissing"));
+            //var response = CreateResponseMessage(Encoding.UTF8.GetString(ArtistApiResponses.ArtistGetInfoMissing));
 
             var parsed = await _command.HandleResponse(response);
 
diff --git a/src/IF.Lastfm.Core.Old.Tests/Api/Commands/CommandTestsBase.cs b/src/IF.Lastfm.Core.Old.Tests/Api/Commands/CommandTestsBase.cs
index 58506c2..d0a1529 100644
--- a/src/IF.Lastfm.Core.Old.Tests/Api/Commands/CommandTestsBase.cs
+++ b/src/IF.Lastfm.Core.Old.Tests/Api/Commands/CommandTestsBase.cs
@@ -24,5 +24,20 @@ protected HttpResponseMessage CreateResponseMessage(string message)
 
             return response;
         }
+
+        private string GetFileContents(string sampleFile)
+        {
+            var asm = Assembly.GetExecutingAssembly();
+            var resource = string.Format("IF.Lastfm.Core.Tests.Resources.{0}", sampleFile);
+            using (var stream = asm.GetManifestResourceStream(resource))
+            {
+                if (stream != null)
+                {
+                    var reader = new StreamReader(stream);
+                    return reader.ReadToEnd();
+                }
+            }
+            return string.Empty;
+        }
     }
 }
diff --git a/src/IF.Lastfm.Core.Tests/Api/Commands/UserGetTopAlbumsCommandTests.cs b/src/IF.Lastfm.Core.Tests/Api/Commands/UserGetTopAlbumsCommandTests.cs
index ce93285..47042fd 100644
--- a/src/IF.Lastfm.Core.Tests/Api/Commands/UserGetTopAlbumsCommandTests.cs
+++ b/src/IF.Lastfm.Core.Tests/Api/Commands/UserGetTopAlbumsCommandTests.cs
@@ -106,7 +106,7 @@ public async Task HandleResponseSingle()
         }
 
         [Test]
-        //[Ignore]
+        [Ignore("Not implemented - ignore")]
         public async Task HandleResponseMultiple()
         {
 
diff --git a/src/IF.Lastfm.Core.Tests/IF.Lastfm.Core.Tests.csproj b/src/IF.Lastfm.Core.Tests/IF.Lastfm.Core.Tests.csproj
index 41b2cdc..3c04f08 100644
--- a/src/IF.Lastfm.Core.Tests/IF.Lastfm.Core.Tests.csproj
+++ b/src/IF.Lastfm.Core.Tests/IF.Lastfm.Core.Tests.csproj
@@ -17,6 +17,14 @@
     <ProjectReference Include="..\IF.Lastfm.Core\IF.Lastfm.Core.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Remove="Resources\**\*.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**\*.json" />
+  </ItemGroup>
+
 <!--
   <ItemGroup>
       <Reference Include="Moq, Version=4.2.1502.911, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">