--- a/RegressionTests__ExceptionTest.st	Mon Feb 16 16:38:27 2015 +0100
+++ b/RegressionTests__ExceptionTest.st	Wed Mar 11 18:03:28 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "{ Package: 'exept:regression' }"
 
 "{ NameSpace: RegressionTests }"
@@ -9,6 +11,13 @@
 	category:'tests-Regression'
 !
 
+Query subclass:#MyQuery
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:ExceptionTest
+!
+
 Exception subclass:#MyResumableTestError
 	instanceVariableNames:''
 	classVariableNames:''
@@ -422,6 +431,46 @@
     "
 !
 
+test14_queryDefaultAnswer
+    |answer|
+
+    answer := MyQuery query.
+    self assert:(answer == #defaultAnswer).
+!
+
+test15_queryWithHandler
+    |answer|
+
+    MyQuery answer:#ok do:[
+        answer := MyQuery query.
+        self assert:(answer == #ok).
+    ].
+!
+
+test16_queryWithHandler2DefaultAnswer
+    |answer|
+
+    MyQuery answer:#ok
+        do:[
+            [
+                answer := MyQuery query.
+                self assert:(answer == #ok2).
+            ] on:MyQuery do:[:ex | ex return:#ok2 ].
+        ].
+!
+
+test17_queryWithHandler3
+    |answer|
+
+    MyQuery answer:#ok
+        do:[
+            [
+                answer := MyQuery query.
+                self assert:(answer == #ok).
+            ] on:AbortAllOperationWantedQuery do:[:ex | ex return:#ok2 ].
+        ].
+!
+
 testHandlerContext
     "A test ensuring that when evaluating the action block the exception environment is set to the handler context."
 
@@ -458,6 +507,12 @@
     "Created: / 20-08-2014 / 17:07:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!ExceptionTest::MyQuery class methodsFor:'default actions'!
+
+defaultAnswer
+    ^ #defaultAnswer
+! !
+
 !ExceptionTest class methodsFor:'documentation'!
 
 version