checkpoint 2 with more test cases, and revert back to the original checkout status.
diff --git a/asterix-app/src/main/resources/asterix-build-configuration.xml b/asterix-app/src/main/resources/asterix-build-configuration.xml
index bd984f0..2a52305 100644
--- a/asterix-app/src/main/resources/asterix-build-configuration.xml
+++ b/asterix-app/src/main/resources/asterix-build-configuration.xml
@@ -10,7 +10,7 @@
   </store>
   <property>
      <name>log_level</name>
-     <value>WARNING</value>
+     <value>SEVERE</value>
      <description></description>
   </property>
 </asterixConfiguration>
diff --git a/asterix-app/src/main/resources/log.properties b/asterix-app/src/main/resources/log.properties
index ee8040a..6ec6917 100644
--- a/asterix-app/src/main/resources/log.properties
+++ b/asterix-app/src/main/resources/log.properties
@@ -1 +1,2 @@
-group_commit_wait_period=1
\ No newline at end of file
+group_commit_wait_period=1
+edu.uci.ics.algebricks.level = INFO
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/issue186/issue186.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/issue186/issue186.1.ddl.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/runtimets/queries/aggregate/issue186/issue186.1.ddl.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/issue186/issue186.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/issue186/issue186.2.update.aql
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asterix-app/src/test/resources/runtimets/queries/aggregate/issue186/issue186.2.update.aql
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/issue186/issue186.3.query.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/issue186/issue186.3.query.aql
new file mode 100644
index 0000000..0ff1d3c
--- /dev/null
+++ b/asterix-app/src/test/resources/runtimets/queries/aggregate/issue186/issue186.3.query.aql
@@ -0,0 +1,3 @@
+for $x in [1, 2]
+let $y := (for $i in [[1,2,3],[10,20,30],[-2,-5,0]] return min($i))
+return min($y)
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/queries/aggregate/issue412/issue412.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/aggregate/issue412/issue412.2.update.aql
index c5d0395..e69de29 100644
--- a/asterix-app/src/test/resources/runtimets/queries/aggregate/issue412/issue412.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/aggregate/issue412/issue412.2.update.aql
@@ -1,3 +0,0 @@
-issue395.1.ddl.aql
-issue395.2.update.aql
-issue395.3.query.aql
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/count_null/count_null.1.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/count_null/count_null.1.adm
index 51d5f4f..df462fe 100644
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/count_null/count_null.1.adm
+++ b/asterix-app/src/test/resources/runtimets/results/aggregate/count_null/count_null.1.adm
@@ -1 +1 @@
-{ "count": null }
\ No newline at end of file
+{ "count": 2 }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/issue186/issue186.1.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/issue186/issue186.1.adm
new file mode 100644
index 0000000..978069e
--- /dev/null
+++ b/asterix-app/src/test/resources/runtimets/results/aggregate/issue186/issue186.1.adm
@@ -0,0 +1,2 @@
+-5
+-5
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/issue395/issue395.1.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/issue395/issue395.1.adm
index d8263ee..bf0d87a 100644
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/issue395/issue395.1.adm
+++ b/asterix-app/src/test/resources/runtimets/results/aggregate/issue395/issue395.1.adm
@@ -1 +1 @@
-2
\ No newline at end of file
+4
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/aggregate/issue412/issue412.1.adm b/asterix-app/src/test/resources/runtimets/results/aggregate/issue412/issue412.1.adm
index d8263ee..e440e5c 100644
--- a/asterix-app/src/test/resources/runtimets/results/aggregate/issue412/issue412.1.adm
+++ b/asterix-app/src/test/resources/runtimets/results/aggregate/issue412/issue412.1.adm
@@ -1 +1 @@
-2
\ No newline at end of file
+3
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/testsuite.xml b/asterix-app/src/test/resources/runtimets/testsuite.xml
index e7840bd..52432f3 100644
--- a/asterix-app/src/test/resources/runtimets/testsuite.xml
+++ b/asterix-app/src/test/resources/runtimets/testsuite.xml
@@ -1,6 +1,11 @@
 <test-suite xmlns="urn:xml.testframework.asterix.ics.uci.edu" ResultOffsetPath="results" QueryOffsetPath="queries" QueryFileExtension=".aql">
   <test-group name="aggregate">
     <test-case FilePath="aggregate">
+      <compilation-unit name="issue186">
+        <output-dir compare="Text">issue186</output-dir>
+      </compilation-unit>
+    </test-case>
+    <test-case FilePath="aggregate">
       <compilation-unit name="issue395">
         <output-dir compare="Text">issue395</output-dir>
       </compilation-unit>