diff --git a/src/Strata.SqlTools.Rules/Rule/Expression/Markdown.cs b/src/Strata.SqlTools.Rules/Rule/Expression/Markdown.cs
index ca1c590..716a14f 100644
--- a/src/Strata.SqlTools.Rules/Rule/Expression/Markdown.cs
+++ b/src/Strata.SqlTools.Rules/Rule/Expression/Markdown.cs
@@ -115,7 +115,7 @@ public static class Markdown
         return ParseAtomicExpression(text);
     }
 
-    private static Expression? TryParseLogicalOperation(string text)
+    private static BoolExpr? TryParseLogicalOperation(string text)
     {
         foreach (var op in LogicalOperators.Keys)
         {
@@ -130,7 +130,7 @@ public static class Markdown
         return null;
     }
 
-    private static Expression? TryParseComparison(string text)
+    private static Comparison? TryParseComparison(string text)
     {
         foreach (var op in ComparisonOperators.Keys)
         {
diff --git a/src/Strata.SqlTools.Rules/Rule/RuleSet.cs b/src/Strata.SqlTools.Rules/Rule/RuleSet.cs
index 6dbc2d0..a90d5b2 100644
--- a/src/Strata.SqlTools.Rules/Rule/RuleSet.cs
+++ b/src/Strata.SqlTools.Rules/Rule/RuleSet.cs
@@ -50,7 +50,7 @@ public class RuleSet : IGroup
     /// </summary>
     /// <param name="group">The rule group to traverse.</param>
     /// <returns>An enumerable of all single rules found in the group.</returns>
-    private static IEnumerable<SingleRule> GetAllSingleRules(IGroup group)
+    private static List<SingleRule> GetAllSingleRules(IGroup group)
     {
         var rules = new List<SingleRule>();
         foreach (var rule in group.Rules)
diff --git a/src/Strata.SqlTools.SqlBreakdown/Classes/SqlExpressionClause.cs b/src/Strata.SqlTools.SqlBreakdown/Classes/SqlExpressionClause.cs
index e1bffdc..c747d40 100644
--- a/src/Strata.SqlTools.SqlBreakdown/Classes/SqlExpressionClause.cs
+++ b/src/Strata.SqlTools.SqlBreakdown/Classes/SqlExpressionClause.cs
@@ -85,7 +85,7 @@ public class SqlExpressionClause : SqlClause, ISqlExpressionClause
     /// </summary>
     /// <param name="clause">The clause to split.</param>
     /// <returns>An enumerable collection of individual items.</returns>
-    private static IEnumerable<string> SplitOnComma(string clause)
+    private static List<string> SplitOnComma(string clause)
     {
         var items = new List<string>();
         var current = new StringBuilder();
diff --git a/tests/Strata.SqlTools.EFCore.Tests/QueryBreakdownRepositoryTests.cs b/tests/Strata.SqlTools.EFCore.Tests/QueryBreakdownRepositoryTests.cs
index 2641cde..eaad8d3 100644
--- a/tests/Strata.SqlTools.EFCore.Tests/QueryBreakdownRepositoryTests.cs
+++ b/tests/Strata.SqlTools.EFCore.Tests/QueryBreakdownRepositoryTests.cs
@@ -11,7 +11,7 @@ public class QueryBreakdownRepositoryTests
 {
     private DbContext _dbContext = null!;
     private IQueryBreakdownMapper _mapper = null!;
-    private IQueryBreakdownRepository _repository = null!;
+    private QueryBreakdownRepository _repository = null!;
 
     [SetUp]
     public void Setup()
diff --git a/tests/Strata.SqlTools.Rules.Tests/UnitTest1.cs b/tests/Strata.SqlTools.Rules.Tests/UnitTest1.cs
index 83f2a63..382ed2d 100644
--- a/tests/Strata.SqlTools.Rules.Tests/UnitTest1.cs
+++ b/tests/Strata.SqlTools.Rules.Tests/UnitTest1.cs
@@ -148,7 +148,7 @@ public class Tests
         return result;
     }
 
-    static System.Linq.Expressions.Expression StartsWith(System.Linq.Expressions.Expression expression, string value)
+    static MethodCallExpression StartsWith(System.Linq.Expressions.Expression expression, string value)
     {
         return StartsWith(expression, LinqExpression.Constant(value));
     }