diff --git a/src/test/groovy/net/fortuna/ical4j/model/parameter/DisplayTest.groovy b/src/test/groovy/net/fortuna/ical4j/model/parameter/DisplayTest.groovy
index 432c998ce..9b1283c88 100644
--- a/src/test/groovy/net/fortuna/ical4j/model/parameter/DisplayTest.groovy
+++ b/src/test/groovy/net/fortuna/ical4j/model/parameter/DisplayTest.groovy
@@ -35,6 +35,6 @@ END:VCALENDAR\r
         Calendar calendar = builder.build(new StringReader(calendarString))
 
         then: 'a valid calendar is realised'
-        calendar?.components[0].properties[0].getParameter('DISPLAY').value == 'BADGE,THUMBNAIL'
+        calendar?.components.all[0].properties.all[0].parameters.getRequired('DISPLAY').value == 'BADGE,THUMBNAIL'
     }
 }
diff --git a/src/test/groovy/net/fortuna/ical4j/model/parameter/EmailTest.groovy b/src/test/groovy/net/fortuna/ical4j/model/parameter/EmailTest.groovy
index 3ab641c07..96bf3b1da 100644
--- a/src/test/groovy/net/fortuna/ical4j/model/parameter/EmailTest.groovy
+++ b/src/test/groovy/net/fortuna/ical4j/model/parameter/EmailTest.groovy
@@ -35,6 +35,6 @@ END:VCALENDAR
         Calendar calendar = builder.build(new StringReader(calendarString))
 
         then: 'a valid calendar is realised'
-        calendar?.components[0].properties[0].getParameter('EMAIL').value == 'cyrus@example.com'
+        calendar?.components.all[0].properties.all[0].parameters.getRequired('EMAIL').value == 'cyrus@example.com'
     }
 }
diff --git a/src/test/groovy/net/fortuna/ical4j/model/parameter/FeatureTest.groovy b/src/test/groovy/net/fortuna/ical4j/model/parameter/FeatureTest.groovy
index 3cd6be464..76acb12ba 100644
--- a/src/test/groovy/net/fortuna/ical4j/model/parameter/FeatureTest.groovy
+++ b/src/test/groovy/net/fortuna/ical4j/model/parameter/FeatureTest.groovy
@@ -42,6 +42,6 @@ END:VCALENDAR
         Calendar calendar = builder.build(new StringReader(calendarString))
 
         then: 'a valid calendar is realised'
-        calendar?.components[0].properties[0].getParameter('FEATURE').value == 'AUDIO'
+        calendar?.components.all[0].properties.all[0].parameters.getRequired('FEATURE').value == 'AUDIO'
     }
 }
diff --git a/src/test/groovy/net/fortuna/ical4j/model/parameter/LabelTest.groovy b/src/test/groovy/net/fortuna/ical4j/model/parameter/LabelTest.groovy
index 703121ff5..1b6b59264 100644
--- a/src/test/groovy/net/fortuna/ical4j/model/parameter/LabelTest.groovy
+++ b/src/test/groovy/net/fortuna/ical4j/model/parameter/LabelTest.groovy
@@ -34,6 +34,6 @@ END:VCALENDAR
         Calendar calendar = builder.build(new StringReader(calendarString))
 
         then: 'a valid calendar is realised'
-        calendar?.components[0].properties[0].getParameter('LABEL').value == 'Web video chat, access code=76543'
+        calendar?.components.all[0].properties.all[0].parameters.getRequired('LABEL').value == 'Web video chat, access code=76543'
     }
 }