diff --git a/src/org/ohdsi/rabbitInAHat/ETLPackageTestFrameWorkGenerator.java b/src/org/ohdsi/rabbitInAHat/ETLPackageTestFrameWorkGenerator.java
index 7be5284a..3459c449 100644
--- a/src/org/ohdsi/rabbitInAHat/ETLPackageTestFrameWorkGenerator.java
+++ b/src/org/ohdsi/rabbitInAHat/ETLPackageTestFrameWorkGenerator.java
@@ -123,7 +123,7 @@ private static void createExpectFunctions(List<String> r, int type, Database dat
 				testDefs.add("    if (is.null(" + rFieldName + ")) {");
 				testDefs.add("      whereClauses <- c(whereClauses, \"" + sqlFieldName + " IS NULL\")");
 				testDefs.add("    } else if (is(" + rFieldName + ", \"subQuery\")){");
-				testDefs.add("      whereClasues <- c(whereClasues, paste0(\"" + sqlFieldName + " = (\", as.character(" + rFieldName + "), \")\"))");
+				testDefs.add("      whereClauses <- c(whereClauses, paste0(\"" + sqlFieldName + " = (\", as.character(" + rFieldName + "), \")\"))");
 				testDefs.add("    } else {");
 				testDefs.add("      whereClauses <- c(whereClauses, paste0(\"" + sqlFieldName + " = '\", " + rFieldName + ",\"'\"))");
 				testDefs.add("    }");
@@ -206,7 +206,7 @@ private static void createLookupFunctions(List<String> r, Database database) {
 				testDefs.add("    if (is.null(" + rFieldName + ")) {");
 				testDefs.add("      whereClauses <- c(whereClauses, \"" + sqlFieldName + " IS NULL\")");
 				testDefs.add("    } else {");
-				testDefs.add("      whereClauses <- c(whereClauses, \"" + sqlFieldName + " = '\", " + rFieldName + ",\"'\")");
+				testDefs.add("      whereClauses <- c(whereClauses, paste0(\"" + sqlFieldName + " = '\", " + rFieldName + ",\"'\"))");
 				testDefs.add("    }");
 				testDefs.add("  }");
 				testDefs.add("");