diff --git a/testing/tests/binding/1040-GET-mashup-other-user.result b/testing/tests/binding/1040-GET-mashup-other-user.result
index 75022202..afb13f86 100644
--- a/testing/tests/binding/1040-GET-mashup-other-user.result
+++ b/testing/tests/binding/1040-GET-mashup-other-user.result
@@ -41,97 +41,6 @@ END:VEVENT
 BEGIN:VEVENT
 SUMMARY:Busy
 CLASS:CONFIDENTIAL
-DTSTART:20070614T100000
-DTEND:20070614T110000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20110106T140000
-DTEND:20110106T150000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070710T093000
-DTEND:20070710T120000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070611T160000
-DTEND:20070611T180000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20070616
-DTEND;VALUE=DATE:20070617
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20070824
-DTEND;VALUE=DATE:20070825
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070627T154500
-DTEND:20070627T234500
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20110108T140000
-DTEND:20110109T000000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070612T180000
-DTEND:20070612T183000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20110111T140000
-DTEND:20110111T160000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070612T110000
-DTEND:20070612T115000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20101228T201500
-DTEND:20101228T211500
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20070630
-DTEND;VALUE=DATE:20070701
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
 DTSTART:20070611T131500
 DTEND:20070611T134500
 UID:ignore_uid
@@ -139,104 +48,6 @@ END:VEVENT
 BEGIN:VEVENT
 SUMMARY:Busy
 CLASS:CONFIDENTIAL
-DTSTART:20070611T140000
-DTEND:20070611T180000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20071111
-DTEND;VALUE=DATE:20071112
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070612T160000
-DTEND:20070612T172000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20101230T140000
-DTEND:20101230T143000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070612T180000
-DTEND:20070612T210000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20070629
-DTEND;VALUE=DATE:20070630
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20070915
-DTEND;VALUE=DATE:20070916
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20070713
-DTEND;VALUE=DATE:20070714
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20101231T112000
-DTEND:20101231T140500
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20070615
-DTEND;VALUE=DATE:20070618
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20070628
-DTEND;VALUE=DATE:20070629
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20070614
-DTEND;VALUE=DATE:20070622
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070611T180000
-DTEND:20070611T181500
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070613T100000
-DTEND:20070613T111000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
 DTSTART:20070628T193000
 DTEND:20070628T223000
 UID:ignore_uid
@@ -244,8 +55,29 @@ END:VEVENT
 BEGIN:VEVENT
 SUMMARY:Busy
 CLASS:CONFIDENTIAL
-DTSTART:20070613T180000
-DTEND:20070613T203000
+DTSTART;VALUE=DATE:20070615
+DTEND;VALUE=DATE:20070618
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070614T100000
+DTEND:20070614T110000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20101230T140000
+DTEND:20101230T143000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070611T180000
+DTEND:20070611T181500
 UID:ignore_uid
 END:VEVENT
 BEGIN:VEVENT
@@ -262,6 +94,174 @@ DTSTART:20070612T180000
 DTEND:20070612T200000
 UID:ignore_uid
 END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070611T140000
+DTEND:20070611T180000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20110111T140000
+DTEND:20110111T160000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20110106T140000
+DTEND:20110106T150000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART;VALUE=DATE:20070629
+DTEND;VALUE=DATE:20070630
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070613T180000
+DTEND:20070613T203000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART;VALUE=DATE:20070824
+DTEND;VALUE=DATE:20070825
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20101228T201500
+DTEND:20101228T211500
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070613T100000
+DTEND:20070613T111000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART;VALUE=DATE:20070713
+DTEND;VALUE=DATE:20070714
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20110108T140000
+DTEND:20110109T000000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART;VALUE=DATE:20071111
+DTEND;VALUE=DATE:20071112
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070710T093000
+DTEND:20070710T120000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART;VALUE=DATE:20070915
+DTEND;VALUE=DATE:20070916
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070612T180000
+DTEND:20070612T183000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070612T180000
+DTEND:20070612T210000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART;VALUE=DATE:20070614
+DTEND;VALUE=DATE:20070622
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART;VALUE=DATE:20070616
+DTEND;VALUE=DATE:20070617
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070612T110000
+DTEND:20070612T115000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART;VALUE=DATE:20070630
+DTEND;VALUE=DATE:20070701
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20101231T112000
+DTEND:20101231T140500
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART;VALUE=DATE:20070628
+DTEND;VALUE=DATE:20070629
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070627T154500
+DTEND:20070627T234500
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070611T160000
+DTEND:20070611T180000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070612T160000
+DTEND:20070612T172000
+UID:ignore_uid
+END:VEVENT
 BEGIN:VTIMEZONE
 TZID:Europe/Helsinki
 BEGIN:DAYLIGHT