diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-dto-roundtrip.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-dto-roundtrip.js
index 38786ebb26436500eff63678f3f6bf81690516e7..420c3d6a89e1b3117725d59ad670c4c0c6328815 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-dto-roundtrip.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-dto-roundtrip.js
@@ -49,7 +49,7 @@ define(['jquery', 'underscore', 'openbis', 'test/common'], function($, _, openbi
 					var dtos = Array.prototype.slice.call(arguments);
 					var roundtrips = _.map(dtos, function(dto){
 
-						c.ok("Testing " + dto['@type']);
+						c.ok("======== Testing " + dto['@type']);
 						c.ok('Rountrip ok.');
 
 						var proto = require(dto['@type'].replace(/\./g, '/'));
@@ -74,6 +74,7 @@ define(['jquery', 'underscore', 'openbis', 'test/common'], function($, _, openbi
 
 									if (setter) {
 										subj[setter](val);
+										c.ok("FIELD: " + key + " = >" + val + "<")
 									} else {
 										c.ok("Skipping field " + key + " that has no setter.");
 									}
diff --git a/js-test/source/java/ch/systemsx/cisd/openbis/jstest/service/V3ApiDtoTestService.java b/js-test/source/java/ch/systemsx/cisd/openbis/jstest/service/V3ApiDtoTestService.java
index 1eae21d8b6944816ef61c6d56a31e5f24bad0e76..079966a640a9c256b50d7159bb8eacdef33365c3 100644
--- a/js-test/source/java/ch/systemsx/cisd/openbis/jstest/service/V3ApiDtoTestService.java
+++ b/js-test/source/java/ch/systemsx/cisd/openbis/jstest/service/V3ApiDtoTestService.java
@@ -85,14 +85,14 @@ public class V3ApiDtoTestService implements ICustomASServiceExecutor
             return new Date(rnd);
         } 
 
-        if (type == Long.class) {
+        if (type == Long.class || type == Long.TYPE) {
             return rnd;
         } 
         
-        if (type == Boolean.class) {
+        if (type == Boolean.class || type == Boolean.TYPE) {
             return random < 0.5;
         } 
-        
+        System.out.println("Complex type: " + type.getName());
         
         return null;
     }