diff --git a/sdk/src/Services/DynamoDBv2/Custom/DataModel/AsyncSearch.cs b/sdk/src/Services/DynamoDBv2/Custom/DataModel/AsyncSearch.cs
index e08008c8dc50..159c1281be09 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DataModel/AsyncSearch.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DataModel/AsyncSearch.cs
@@ -13,18 +13,38 @@
  * permissions and limitations under the License.
  */
 
-using Amazon.DynamoDBv2.DataModel;
 using Amazon.DynamoDBv2.DocumentModel;
 
 namespace Amazon.DynamoDBv2.DataModel
 {
+    /// <summary>
+    /// Interface retrieving search results (Query or Scan)
+    /// from DynamoDB.
+    /// </summary>
+    public partial interface IAsyncSearch<T>
+    {
+        /// <summary>
+        /// Flag that, if true, indicates that the search is done
+        /// </summary>
+        bool IsDone { get; }
+
+        /// <summary>
+        /// Pagination token corresponding to the item where the search operation stopped,
+        /// inclusive of the previous result set. Use this value to start a new
+        /// operation to resume search from the next item.
+        /// </summary>
+        string PaginationToken { get; }
+    }
+
     /// <summary>
     /// A strongly-typed object for retrieving search results (Query or Scan)
     /// from DynamoDB.
     /// </summary>
-    public partial class AsyncSearch<T>
+    public partial class AsyncSearch<T> : IAsyncSearch<T>
     {
-        #region Constructor
+        private Search _documentSearch { get; set; }
+        private DynamoDBContext _sourceContext { get; set; }
+        private DynamoDBFlatConfig _config { get; set; }
 
         /// <summary>
         /// This constructor is used for mocking. Users that want to mock AsyncSearch can create a subclass of AsyncSearch and make a public parameterless constructor.
@@ -36,47 +56,27 @@ protected AsyncSearch()
 
         internal AsyncSearch(DynamoDBContext source, DynamoDBContext.ContextSearch contextSearch)
         {
-            SourceContext = source;
-            DocumentSearch = contextSearch.Search;
-            Config = contextSearch.FlatConfig;
+            _sourceContext = source;
+            _documentSearch = contextSearch.Search;
+            _config = contextSearch.FlatConfig;
         }
 
-        #endregion
-
-        #region Private members
-
-        private Search DocumentSearch { get; set; }
-        private DynamoDBContext SourceContext { get; set; }
-        private DynamoDBFlatConfig Config { get; set; }
-
-        #endregion
-
-        #region Public properties
-
-        /// <summary>
-        /// Flag that, if true, indicates that the search is done
-        /// </summary>
+        /// <inheritdoc/>
         public virtual bool IsDone
         {
             get
             {
-                return DocumentSearch.IsDone;
+                return _documentSearch.IsDone;
             }
         }
 
-        /// <summary>
-        /// Pagination token corresponding to the item where the search operation stopped,
-        /// inclusive of the previous result set. Use this value to start a new
-        /// operation to resume search from the next item.
-        /// </summary>
+        /// <inheritdoc/>
         public virtual string PaginationToken
         {
             get
             {
-                return DocumentSearch.PaginationToken;
+                return _documentSearch.PaginationToken;
             }
         }
-
-        #endregion
     }
 }
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DataModel/_async/AsyncSearch.Async.cs b/sdk/src/Services/DynamoDBv2/Custom/DataModel/_async/AsyncSearch.Async.cs
index 8945c588fabd..c37d83a73c6d 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DataModel/_async/AsyncSearch.Async.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DataModel/_async/AsyncSearch.Async.cs
@@ -18,21 +18,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-using Amazon.Runtime.Internal;
-using Amazon.DynamoDBv2.DocumentModel;
-using Amazon.DynamoDBv2.DataModel;
-
 namespace Amazon.DynamoDBv2.DataModel
 {
-    /// <summary>
-    /// A strongly-typed object for retrieving search results (Query or Scan)
-    /// from DynamoDB.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public partial class AsyncSearch<T>
+    public partial interface IAsyncSearch<T>
     {
-        #region Async public
-
         /// <summary>
         /// Initiates the asynchronous execution to get the next set of results from DynamoDB.
         /// 
@@ -45,12 +34,7 @@ public partial class AsyncSearch<T>
         /// A Task that can be used to poll or wait for results, or both.
         /// Results will include the next set of result items from DynamoDB.
         /// </returns>
-        public virtual async Task<List<T>> GetNextSetAsync(CancellationToken cancellationToken = default(CancellationToken))
-        {
-            var documents = await DocumentSearch.GetNextSetHelperAsync(cancellationToken).ConfigureAwait(false);
-            List<T> items = SourceContext.FromDocumentsHelper<T>(documents, this.Config).ToList();
-            return items;
-        }
+        Task<List<T>> GetNextSetAsync(CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Initiates the asynchronous execution to get all the remaining results from DynamoDB.
@@ -60,13 +44,25 @@ public partial class AsyncSearch<T>
         /// A Task that can be used to poll or wait for results, or both.
         /// Results will include the remaining result items from DynamoDB.
         /// </returns>
-        public virtual async Task<List<T>> GetRemainingAsync(CancellationToken cancellationToken = default(CancellationToken))
+        Task<List<T>> GetRemainingAsync(CancellationToken cancellationToken = default(CancellationToken));
+    }
+
+    public partial class AsyncSearch<T> : IAsyncSearch<T>
+    {
+        /// <inheritdoc/>
+        public virtual async Task<List<T>> GetNextSetAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
-            var documents = await DocumentSearch.GetRemainingHelperAsync(cancellationToken).ConfigureAwait(false);
-            List<T> items = SourceContext.FromDocumentsHelper<T>(documents, this.Config).ToList();
+            var documents = await _documentSearch.GetNextSetHelperAsync(cancellationToken).ConfigureAwait(false);
+            List<T> items = _sourceContext.FromDocumentsHelper<T>(documents, this._config).ToList();
             return items;
         }
 
-        #endregion
+        /// <inheritdoc/>
+        public virtual async Task<List<T>> GetRemainingAsync(CancellationToken cancellationToken = default(CancellationToken))
+        {
+            var documents = await _documentSearch.GetRemainingHelperAsync(cancellationToken).ConfigureAwait(false);
+            List<T> items = _sourceContext.FromDocumentsHelper<T>(documents, this._config).ToList();
+            return items;
+        }
     }
 }
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DataModel/_async/Context.Async.cs b/sdk/src/Services/DynamoDBv2/Custom/DataModel/_async/Context.Async.cs
index a408abb50e5a..05bc235e6a7c 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DataModel/_async/Context.Async.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DataModel/_async/Context.Async.cs
@@ -256,7 +256,7 @@ public Task ExecuteBatchGetAsync(params IBatchGet[] batches)
         #region Scan async
 
         /// <inheritdoc/>
-        public AsyncSearch<T> ScanAsync<T>(IEnumerable<ScanCondition> conditions)
+        public IAsyncSearch<T> ScanAsync<T>(IEnumerable<ScanCondition> conditions)
         {
             var scan = ConvertScan<T>(conditions, null);
             return FromSearchAsync<T>(scan);
@@ -264,21 +264,21 @@ public AsyncSearch<T> ScanAsync<T>(IEnumerable<ScanCondition> conditions)
 
         /// <inheritdoc/>
         [Obsolete("Use the ScanAsync overload that takes ScanConfig instead, since DynamoDBOperationConfig contains properties that are not applicable to ScanAsync.")]
-        public AsyncSearch<T> ScanAsync<T>(IEnumerable<ScanCondition> conditions, DynamoDBOperationConfig operationConfig = null)
+        public IAsyncSearch<T> ScanAsync<T>(IEnumerable<ScanCondition> conditions, DynamoDBOperationConfig operationConfig = null)
         {
             var scan = ConvertScan<T>(conditions, operationConfig);
             return FromSearchAsync<T>(scan);
         }
 
         /// <inheritdoc/>
-        public AsyncSearch<T> ScanAsync<T>(IEnumerable<ScanCondition> conditions, ScanConfig scanConfig)
+        public IAsyncSearch<T> ScanAsync<T>(IEnumerable<ScanCondition> conditions, ScanConfig scanConfig)
         {
             var scan = ConvertScan<T>(conditions, scanConfig?.ToDynamoDBOperationConfig());
             return FromSearchAsync<T>(scan);
         }
 
         /// <inheritdoc/>
-        public AsyncSearch<T> FromScanAsync<T>(ScanOperationConfig scanConfig)
+        public IAsyncSearch<T> FromScanAsync<T>(ScanOperationConfig scanConfig)
         {
             if (scanConfig == null) throw new ArgumentNullException("scanConfig");
 
@@ -288,7 +288,7 @@ public AsyncSearch<T> FromScanAsync<T>(ScanOperationConfig scanConfig)
 
         /// <inheritdoc/>
         [Obsolete("Use the FromScanAsync overload that takes ScanConfig instead, since DynamoDBOperationConfig contains properties that are not applicable to FromScanAsync.")]
-        public AsyncSearch<T> FromScanAsync<T>(ScanOperationConfig scanConfig, DynamoDBOperationConfig operationConfig = null)
+        public IAsyncSearch<T> FromScanAsync<T>(ScanOperationConfig scanConfig, DynamoDBOperationConfig operationConfig = null)
         {
             if (scanConfig == null) throw new ArgumentNullException("scanConfig");
 
@@ -297,7 +297,7 @@ public AsyncSearch<T> FromScanAsync<T>(ScanOperationConfig scanConfig, DynamoDBO
         }
 
         /// <inheritdoc/>
-        public AsyncSearch<T> FromScanAsync<T>(ScanOperationConfig scanConfig, FromScanConfig fromScanConfig)
+        public IAsyncSearch<T> FromScanAsync<T>(ScanOperationConfig scanConfig, FromScanConfig fromScanConfig)
         {
             if (scanConfig == null) throw new ArgumentNullException("scanConfig");
 
@@ -310,7 +310,7 @@ public AsyncSearch<T> FromScanAsync<T>(ScanOperationConfig scanConfig, FromScanC
         #region Query async
 
         /// <inheritdoc/>
-        public AsyncSearch<T> QueryAsync<T>(object hashKeyValue)
+        public IAsyncSearch<T> QueryAsync<T>(object hashKeyValue)
         {
             var query = ConvertQueryByValue<T>(hashKeyValue, null, null);
             return FromSearchAsync<T>(query);
@@ -318,21 +318,21 @@ public AsyncSearch<T> QueryAsync<T>(object hashKeyValue)
 
         /// <inheritdoc/>
         [Obsolete("Use the QueryAsync overload that takes QueryConfig instead, since DynamoDBOperationConfig contains properties that are not applicable to QueryAsync.")]
-        public AsyncSearch<T> QueryAsync<T>(object hashKeyValue, DynamoDBOperationConfig operationConfig = null)
+        public IAsyncSearch<T> QueryAsync<T>(object hashKeyValue, DynamoDBOperationConfig operationConfig = null)
         {
             var query = ConvertQueryByValue<T>(hashKeyValue, null, operationConfig);
             return FromSearchAsync<T>(query);
         }
 
         /// <inheritdoc/>
-        public AsyncSearch<T> QueryAsync<T>(object hashKeyValue, QueryConfig queryConfig)
+        public IAsyncSearch<T> QueryAsync<T>(object hashKeyValue, QueryConfig queryConfig)
         {
             var query = ConvertQueryByValue<T>(hashKeyValue, null, queryConfig?.ToDynamoDBOperationConfig());
             return FromSearchAsync<T>(query);
         }
 
         /// <inheritdoc/>
-        public AsyncSearch<T> QueryAsync<T>(object hashKeyValue, QueryOperator op, IEnumerable<object> values)
+        public IAsyncSearch<T> QueryAsync<T>(object hashKeyValue, QueryOperator op, IEnumerable<object> values)
         {
             if (values == null)
                 throw new ArgumentNullException("values");
@@ -343,7 +343,7 @@ public AsyncSearch<T> QueryAsync<T>(object hashKeyValue, QueryOperator op, IEnum
 
         /// <inheritdoc/>
         [Obsolete("Use the QueryAsync overload that takes QueryConfig instead, since DynamoDBOperationConfig contains properties that are not applicable to QueryAsync.")]
-        public AsyncSearch<T> QueryAsync<T>(object hashKeyValue, QueryOperator op, IEnumerable<object> values, DynamoDBOperationConfig operationConfig = null)
+        public IAsyncSearch<T> QueryAsync<T>(object hashKeyValue, QueryOperator op, IEnumerable<object> values, DynamoDBOperationConfig operationConfig = null)
         {
             if (values == null)
                 throw new ArgumentNullException("values");
@@ -353,7 +353,7 @@ public AsyncSearch<T> QueryAsync<T>(object hashKeyValue, QueryOperator op, IEnum
         }
 
         /// <inheritdoc/>
-        public AsyncSearch<T> QueryAsync<T>(object hashKeyValue, QueryOperator op, IEnumerable<object> values, QueryConfig queryConfig)
+        public IAsyncSearch<T> QueryAsync<T>(object hashKeyValue, QueryOperator op, IEnumerable<object> values, QueryConfig queryConfig)
         {
             if (values == null)
                 throw new ArgumentNullException("values");
@@ -363,7 +363,7 @@ public AsyncSearch<T> QueryAsync<T>(object hashKeyValue, QueryOperator op, IEnum
         }
 
         /// <inheritdoc/>
-        public AsyncSearch<T> FromQueryAsync<T>(QueryOperationConfig queryConfig)
+        public IAsyncSearch<T> FromQueryAsync<T>(QueryOperationConfig queryConfig)
         {
             if (queryConfig == null) throw new ArgumentNullException("queryConfig");
 
@@ -373,7 +373,7 @@ public AsyncSearch<T> FromQueryAsync<T>(QueryOperationConfig queryConfig)
 
         /// <inheritdoc/>
         [Obsolete("Use the FromQueryAsync overload that takes QueryConfig instead, since DynamoDBOperationConfig contains properties that are not applicable to FromQueryAsync.")]
-        public AsyncSearch<T> FromQueryAsync<T>(QueryOperationConfig queryConfig, DynamoDBOperationConfig operationConfig = null)
+        public IAsyncSearch<T> FromQueryAsync<T>(QueryOperationConfig queryConfig, DynamoDBOperationConfig operationConfig = null)
         {
             if (queryConfig == null) throw new ArgumentNullException("queryConfig");
 
@@ -382,7 +382,7 @@ public AsyncSearch<T> FromQueryAsync<T>(QueryOperationConfig queryConfig, Dynamo
         }
 
         /// <inheritdoc/>
-        public AsyncSearch<T> FromQueryAsync<T>(QueryOperationConfig queryConfig, FromQueryConfig fromQueryConfig)
+        public IAsyncSearch<T> FromQueryAsync<T>(QueryOperationConfig queryConfig, FromQueryConfig fromQueryConfig)
         {
             if (queryConfig == null) throw new ArgumentNullException("queryConfig");
 
diff --git a/sdk/src/Services/DynamoDBv2/Custom/DataModel/_async/IDynamoDBContext.Async.cs b/sdk/src/Services/DynamoDBv2/Custom/DataModel/_async/IDynamoDBContext.Async.cs
index 1417c11689c8..b84b785ac6c4 100644
--- a/sdk/src/Services/DynamoDBv2/Custom/DataModel/_async/IDynamoDBContext.Async.cs
+++ b/sdk/src/Services/DynamoDBv2/Custom/DataModel/_async/IDynamoDBContext.Async.cs
@@ -482,7 +482,7 @@ partial interface IDynamoDBContext
         /// Conditions that the results should meet.
         /// </param>
         /// <returns>AsyncSearch which can be used to retrieve DynamoDB data.</returns>
-        AsyncSearch<T> ScanAsync<T>(IEnumerable<ScanCondition> conditions);
+        IAsyncSearch<T> ScanAsync<T>(IEnumerable<ScanCondition> conditions);
 
         /// <summary>
         /// Configures an async Scan operation against DynamoDB, finding items
@@ -496,7 +496,7 @@ partial interface IDynamoDBContext
         /// <returns>AsyncSearch which can be used to retrieve DynamoDB data.</returns>
 
         [Obsolete("Use the ScanAsync overload that takes ScanConfig instead, since DynamoDBOperationConfig contains properties that are not applicable to ScanAsync.")]
-        AsyncSearch<T> ScanAsync<T>(IEnumerable<ScanCondition> conditions, DynamoDBOperationConfig operationConfig = null);
+        IAsyncSearch<T> ScanAsync<T>(IEnumerable<ScanCondition> conditions, DynamoDBOperationConfig operationConfig = null);
 
         /// <summary>
         /// Configures an async Scan operation against DynamoDB, finding items
@@ -508,7 +508,7 @@ partial interface IDynamoDBContext
         /// </param>
         /// <param name="scanConfig">Config object that can be used to override properties on the table's context for this request.</param>
         /// <returns>AsyncSearch which can be used to retrieve DynamoDB data.</returns>
-        AsyncSearch<T> ScanAsync<T>(IEnumerable<ScanCondition> conditions, ScanConfig scanConfig);
+        IAsyncSearch<T> ScanAsync<T>(IEnumerable<ScanCondition> conditions, ScanConfig scanConfig);
 
         /// <summary>
         /// Configures an async Scan operation against DynamoDB, finding items
@@ -517,7 +517,7 @@ partial interface IDynamoDBContext
         /// <typeparam name="T">Type of object.</typeparam>
         /// <param name="scanConfig">Scan request object.</param>
         /// <returns>AsyncSearch which can be used to retrieve DynamoDB data.</returns>
-        AsyncSearch<T> FromScanAsync<T>(ScanOperationConfig scanConfig);
+        IAsyncSearch<T> FromScanAsync<T>(ScanOperationConfig scanConfig);
 
         /// <summary>
         /// Configures an async Scan operation against DynamoDB, finding items
@@ -528,7 +528,7 @@ partial interface IDynamoDBContext
         /// <param name="operationConfig">Config object which can be used to override the table used.</param>
         /// <returns>AsyncSearch which can be used to retrieve DynamoDB data.</returns>
         [Obsolete("Use the FromScanAsync overload that takes ScanConfig instead, since DynamoDBOperationConfig contains properties that are not applicable to FromScanAsync.")]
-        AsyncSearch<T> FromScanAsync<T>(ScanOperationConfig scanConfig, DynamoDBOperationConfig operationConfig = null);
+        IAsyncSearch<T> FromScanAsync<T>(ScanOperationConfig scanConfig, DynamoDBOperationConfig operationConfig = null);
 
         /// <summary>
         ///  Configures an async Scan operation against DynamoDB, finding items
@@ -538,7 +538,7 @@ partial interface IDynamoDBContext
         /// <param name="scanConfig">Scan request object.</param>
         /// <param name="fromScanConfig">Config object that can be used to override properties on the table's context for this request.</param>
         /// <returns>AsyncSearch which can be used to retrieve DynamoDB data.</returns>
-        AsyncSearch<T> FromScanAsync<T>(ScanOperationConfig scanConfig, FromScanConfig fromScanConfig);
+        IAsyncSearch<T> FromScanAsync<T>(ScanOperationConfig scanConfig, FromScanConfig fromScanConfig);
 
         #endregion
 
@@ -551,7 +551,7 @@ partial interface IDynamoDBContext
         /// <typeparam name="T">Type of object.</typeparam>
         /// <param name="hashKeyValue">Hash key of the items to query.</param>
         /// <returns>AsyncSearch which can be used to retrieve DynamoDB data.</returns>
-        AsyncSearch<T> QueryAsync<T>(object hashKeyValue);
+        IAsyncSearch<T> QueryAsync<T>(object hashKeyValue);
 
         /// <summary>
         /// Configures an async Query operation against DynamoDB, finding items
@@ -562,7 +562,7 @@ partial interface IDynamoDBContext
         /// <param name="operationConfig">Config object which can be used to override the table used.</param>
         /// <returns>AsyncSearch which can be used to retrieve DynamoDB data.</returns>
         [Obsolete("Use the QueryAsync overload that takes QueryConfig instead, since DynamoDBOperationConfig contains properties that are not applicable to QueryAsync.")]
-        AsyncSearch<T> QueryAsync<T>(object hashKeyValue, DynamoDBOperationConfig operationConfig = null);
+        IAsyncSearch<T> QueryAsync<T>(object hashKeyValue, DynamoDBOperationConfig operationConfig = null);
 
         /// <summary>
         /// Configures an async Query operation against DynamoDB, finding items
@@ -572,7 +572,7 @@ partial interface IDynamoDBContext
         /// <param name="hashKeyValue">Hash key of the items to query.</param>
         /// <param name="queryConfig">Config object that can be used to override properties on the table's context for this request.</param>
         /// <returns>AsyncSearch which can be used to retrieve DynamoDB data.</returns>
-        AsyncSearch<T> QueryAsync<T>(object hashKeyValue, QueryConfig queryConfig);
+        IAsyncSearch<T> QueryAsync<T>(object hashKeyValue, QueryConfig queryConfig);
 
         /// <summary>
         /// Configures an async Query operation against DynamoDB, finding items
@@ -587,7 +587,7 @@ partial interface IDynamoDBContext
         /// For QueryOperator.Betwee, values should be two values.
         /// </param>
         /// <returns>AsyncSearch which can be used to retrieve DynamoDB data.</returns>
-        AsyncSearch<T> QueryAsync<T>(object hashKeyValue, QueryOperator op, IEnumerable<object> values);
+        IAsyncSearch<T> QueryAsync<T>(object hashKeyValue, QueryOperator op, IEnumerable<object> values);
 
         /// <summary>
         /// Configures an async Query operation against DynamoDB, finding items
@@ -604,7 +604,7 @@ partial interface IDynamoDBContext
         /// <param name="operationConfig">Config object which can be used to override the table used.</param>
         /// <returns>AsyncSearch which can be used to retrieve DynamoDB data.</returns>
         [Obsolete("Use the QueryAsync overload that takes QueryConfig instead, since DynamoDBOperationConfig contains properties that are not applicable to QueryAsync.")]
-        AsyncSearch<T> QueryAsync<T>(object hashKeyValue, QueryOperator op, IEnumerable<object> values, DynamoDBOperationConfig operationConfig = null);
+        IAsyncSearch<T> QueryAsync<T>(object hashKeyValue, QueryOperator op, IEnumerable<object> values, DynamoDBOperationConfig operationConfig = null);
 
         /// <summary>
         /// Configures an async Query operation against DynamoDB, finding items
@@ -620,7 +620,7 @@ partial interface IDynamoDBContext
         /// </param>
         /// <param name="queryConfig">Config object that can be used to override properties on the table's context for this request.</param>
         /// <returns>AsyncSearch which can be used to retrieve DynamoDB data.</returns>
-        AsyncSearch<T> QueryAsync<T>(object hashKeyValue, QueryOperator op, IEnumerable<object> values, QueryConfig queryConfig);
+        IAsyncSearch<T> QueryAsync<T>(object hashKeyValue, QueryOperator op, IEnumerable<object> values, QueryConfig queryConfig);
 
         /// <summary>
         /// Configures an async Query operation against DynamoDB using a mid-level document model 
@@ -629,7 +629,7 @@ partial interface IDynamoDBContext
         /// <typeparam name="T">Type of object.</typeparam>
         /// <param name="queryConfig">Mid-level, document model query request object.</param>
         /// <returns>AsyncSearch which can be used to retrieve DynamoDB data.</returns>
-        AsyncSearch<T> FromQueryAsync<T>(QueryOperationConfig queryConfig);
+        IAsyncSearch<T> FromQueryAsync<T>(QueryOperationConfig queryConfig);
 
         /// <summary>
         /// Configures an async Query operation against DynamoDB, finding items
@@ -640,7 +640,7 @@ partial interface IDynamoDBContext
         /// <param name="operationConfig">Config object which can be used to override the table used.</param>
         /// <returns>AsyncSearch which can be used to retrieve DynamoDB data.</returns>
         [Obsolete("Use the FromQueryAsync overload that takes QueryConfig instead, since DynamoDBOperationConfig contains properties that are not applicable to FromQueryAsync.")]
-        AsyncSearch<T> FromQueryAsync<T>(QueryOperationConfig queryConfig, DynamoDBOperationConfig operationConfig = null);
+        IAsyncSearch<T> FromQueryAsync<T>(QueryOperationConfig queryConfig, DynamoDBOperationConfig operationConfig = null);
 
         /// <summary>
         /// Configures an async Query operation against DynamoDB using a mid-level document model 
@@ -650,7 +650,7 @@ partial interface IDynamoDBContext
         /// <param name="queryConfig">Mid-level, document model query request object.</param>
         /// <param name="fromQueryConfig">Config object that can be used to override properties on the table's context for this request.</param>
         /// <returns>AsyncSearch which can be used to retrieve DynamoDB data.</returns>
-        AsyncSearch<T> FromQueryAsync<T>(QueryOperationConfig queryConfig, FromQueryConfig fromQueryConfig);
+        IAsyncSearch<T> FromQueryAsync<T>(QueryOperationConfig queryConfig, FromQueryConfig fromQueryConfig);
 
         #endregion
     }
diff --git a/sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/AsyncSearchTests.cs b/sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/AsyncSearchTests.cs
new file mode 100644
index 000000000000..825a203e9179
--- /dev/null
+++ b/sdk/test/Services/DynamoDBv2/UnitTests/Custom/MockabilityTests/AsyncSearchTests.cs
@@ -0,0 +1,93 @@
+using Amazon.DynamoDBv2.DataModel;
+using Amazon.DynamoDBv2.DocumentModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AWSSDK.UnitTests.DynamoDBv2.NetFramework.Custom.MockabilityTests
+{
+    [TestClass]
+    public class AsyncSearchTests
+    {
+        [TestMethod]
+        public async Task TestMockability_ScanAsync()
+        {
+            var mockContext = new Mock<IDynamoDBContext>();
+            mockContext
+                .Setup(x => x.ScanAsync<string>(It.IsAny<IEnumerable<ScanCondition>>()))
+                .Returns(CreateMockAsyncSearch(new List<string> { "item1", "item2" }));
+
+            var ddbContext = mockContext.Object;
+            var asyncSearch = ddbContext.ScanAsync<string>(null);
+
+            var results = await asyncSearch.GetNextSetAsync();
+            Assert.AreEqual(2, results.Count);
+            Assert.AreEqual("item1", results[0]);
+            Assert.AreEqual("item2", results[1]);
+        }
+
+        [TestMethod]
+        public async Task TestMockability_FromScanAsync()
+        {
+            var mockContext = new Mock<IDynamoDBContext>();
+            mockContext
+                .Setup(x => x.FromScanAsync<string>(It.IsAny<ScanOperationConfig>()))
+                .Returns(CreateMockAsyncSearch(new List<string> { "item1", "item2" }));
+
+            var ddbContext = mockContext.Object;
+            var asyncSearch = ddbContext.FromScanAsync<string>(null);
+
+            var results = await asyncSearch.GetNextSetAsync();
+            Assert.AreEqual(2, results.Count);
+            Assert.AreEqual("item1", results[0]);
+            Assert.AreEqual("item2", results[1]);
+        }
+
+        [TestMethod]
+        public async Task TestMockability_QueryAsync()
+        {
+            var mockContext = new Mock<IDynamoDBContext>();
+            mockContext
+                .Setup(x => x.QueryAsync<string>(It.IsAny<object>()))
+                .Returns(CreateMockAsyncSearch(new List<string> { "item1", "item2" }));
+
+            var ddbContext = mockContext.Object;
+            var asyncSearch = ddbContext.QueryAsync<string>(null);
+
+            var results = await asyncSearch.GetNextSetAsync();
+            Assert.AreEqual(2, results.Count);
+            Assert.AreEqual("item1", results[0]);
+            Assert.AreEqual("item2", results[1]);
+        }
+
+        [TestMethod]
+        public async Task TestMockability_FromQueryAsync()
+        {
+            var mockContext = new Mock<IDynamoDBContext>();
+            mockContext
+                .Setup(x => x.FromQueryAsync<string>(It.IsAny<QueryOperationConfig>()))
+                .Returns(CreateMockAsyncSearch(new List<string> { "item1", "item2" }));
+
+            var ddbContext = mockContext.Object;
+            var asyncSearch = ddbContext.FromQueryAsync<string>(null);
+
+            var results = await asyncSearch.GetNextSetAsync();
+            Assert.AreEqual(2, results.Count);
+            Assert.AreEqual("item1", results[0]);
+            Assert.AreEqual("item2", results[1]);
+        }
+
+        public IAsyncSearch<T> CreateMockAsyncSearch<T>(List<T> items)
+        {
+            var mockAsyncSearch = new Mock<IAsyncSearch<T>>();
+
+            mockAsyncSearch
+                .Setup(x => x.GetNextSetAsync(It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(items));
+
+            return mockAsyncSearch.Object;
+        }
+    }
+}