Index: src/templates/artifacts/test-templates/ControllerUnitTests.groovy
===================================================================
--- src/templates/artifacts/test-templates/ControllerUnitTests.groovy	(revision 51520)
+++ src/templates/artifacts/test-templates/ControllerUnitTests.groovy	(working copy)
@@ -19,41 +19,22 @@
     void testList() {
         List @property.name@List = []
         20.times {i -> @property.name@List << new @domain.name@() }
-        
-        // setup a mock control to check the params passed to the list method
-        def mockControl = mockFor(@domain.name@)
-        mockControl.demand.static.list {params ->
-            assert params.max == 10
-            return @property.name@List[0..9]
-        }
-
+        mockDomain(@domain.name@, @property.name@List)
         Map model = controller.list()
         assertNotNull('list should be present in model', model.@property.name@List)
-        assertEquals('list size should match default', 10, model.@property.name@List.size())
-
-        // verify the mocked method was called
-        mockControl.verify()
+        assertEquals('list should match default', @property.name@List[0..9], model.@property.name@List)
+        assertEquals('total should be set in model', @property.name@List.size(), model.@property.name@Total)
     }
 
     void testList_withParams() {
         List @property.name@List = []
         20.times {i -> @property.name@List << new @domain.name@() }
-
-        // setup a mock control to check the params passed to the list method
-        def mockControl = mockFor(@domain.name@)
-        Integer MAX = @property.name@List.size()
-        mockControl.demand.static.list {params ->
-            assert params.max == MAX
-            return @property.name@List
-        }
-
-        controller.params.max = MAX
+        mockDomain(@domain.name@, @property.name@List)
+        controller.params.offset = 5
+        controller.params.max = 10
         def model = controller.list()
         assertNotNull('list should be present in model', model.@property.name@List)
-        assertEquals('list size should match', MAX, model.@property.name@List.size())
-
-        // verify the mocked method was called
-        mockControl.verify()
+        assertEquals('list should match params', @property.name@List[5..14], model.@property.name@List)
     }
 
     void testShow() {