diff --git a/Facepunch.Steamworks.Test/NetworkingSockets.cs b/Facepunch.Steamworks.Test/NetworkingSockets.cs
index 9aebd53..9fca88b 100644
--- a/Facepunch.Steamworks.Test/NetworkingSockets.cs
+++ b/Facepunch.Steamworks.Test/NetworkingSockets.cs
@@ -131,7 +131,7 @@ namespace Steamworks
 					Receive();
 					await Task.Delay( 100 );
 
-					if ( sw.Elapsed.TotalSeconds > 5 )
+					if ( sw.Elapsed.TotalSeconds > 10 )
 					{
 						Assert.Fail( "Client Took Too Long" );
 						break;
@@ -250,9 +250,9 @@ namespace Steamworks
 					Receive();
 					await Task.Delay( 100 );
 
-					if ( sw.Elapsed.TotalSeconds > 5 )
+					if ( sw.Elapsed.TotalSeconds > 10 )
 					{
-						Assert.Fail( "Client Took Too Long" );
+						Assert.Fail( "Socket Took Too Long" );
 						break;
 					}
 				}
@@ -277,6 +277,7 @@ namespace Steamworks
 				if ( str.Contains( "bye" ) )
 				{
 					connection.SendMessage( "See you later, hater." );
+					connection.Flush();
 					connection.Close( true, 10, "Said Bye" );
 				}
 			}
diff --git a/Facepunch.Steamworks.Test/ServerlistTest.cs b/Facepunch.Steamworks.Test/ServerlistTest.cs
index 175e1ab..a6a45c2 100644
--- a/Facepunch.Steamworks.Test/ServerlistTest.cs
+++ b/Facepunch.Steamworks.Test/ServerlistTest.cs
@@ -77,7 +77,7 @@ namespace Steamworks
 				await Task.Delay( 1000 );
 				list.Cancel();
 
-				foreach ( var s in list.Responsive.Take( 10 ) )
+				foreach ( var s in list.Responsive.Take( 10 ).ToArray() )
 				{
 					Console.WriteLine( $"{s.Name} [{s.Address}]" );
 
diff --git a/Facepunch.Steamworks.Test/UgcQuery.cs b/Facepunch.Steamworks.Test/UgcQuery.cs
index 489e6b4..ae3cb5b 100644
--- a/Facepunch.Steamworks.Test/UgcQuery.cs
+++ b/Facepunch.Steamworks.Test/UgcQuery.cs
@@ -28,20 +28,21 @@ namespace Steamworks
 		public async Task QueryWithTags()
 		{
 			var q = Ugc.Query.All
-							.WithTag( "Fun" )
-							.WithTag( "Movie" )
+							.WithTag( "Version3" )
+							.WithTag( "Hunting Bow" )
 							.MatchAllTags();
 
 			var result = await q.GetPageAsync( 1 );
 			Assert.IsNotNull( result );
+			Assert.IsTrue( result?.ResultCount > 0 );
 
 			Console.WriteLine( $"ResultCount: {result?.ResultCount}" );
 			Console.WriteLine( $"TotalCount: {result?.TotalCount}" );
 
 			foreach ( var entry in result.Value.Entries )
 			{
-				Assert.IsTrue( entry.HasTag( "Fun" ) );
-				Assert.IsTrue( entry.HasTag( "Movie" ) );
+				Assert.IsTrue( entry.HasTag( "Version3" ), "Has Tag Version3" );
+				Assert.IsTrue( entry.HasTag( "Hunting Bow" ), "Has Tag HuntingBow" );
 
 			}
 		}
@@ -83,13 +84,14 @@ namespace Steamworks
 		}
 
 		[TestMethod]
-		public async Task QueryFoohy()
+		public async Task QueryGarry()
 		{
 			var q = Ugc.UserQuery.All
-								.FromUser( 76561197997689747 );
+								.FromUser( 76561197960279927 );
 
 			var result = await q.GetPageAsync( 1 );
 			Assert.IsNotNull( result );
+			Assert.IsTrue( result?.ResultCount > 0 );
 
 			Console.WriteLine( $"ResultCount: {result?.ResultCount}" );
 			Console.WriteLine( $"TotalCount: {result?.TotalCount}" );