diff --git a/tests/data/bbsim-bbf-adapter.yaml b/tests/data/bbsim-bbf-adapter.yaml
index c6b7541..70d84aa 100644
--- a/tests/data/bbsim-bbf-adapter.yaml
+++ b/tests/data/bbsim-bbf-adapter.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-bbf-adapter_addDelete_tests.yaml b/tests/data/bbsim-bbf-adapter_addDelete_tests.yaml
index 83e5cf9..96860dc 100644
--- a/tests/data/bbsim-bbf-adapter_addDelete_tests.yaml
+++ b/tests/data/bbsim-bbf-adapter_addDelete_tests.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-16.yaml b/tests/data/bbsim-kind-16.yaml
index 73daf74..9839968 100644
--- a/tests/data/bbsim-kind-16.yaml
+++ b/tests/data/bbsim-kind-16.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON-dt.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON-dt.yaml
index 8514ec5..7f0441a 100755
--- a/tests/data/bbsim-kind-2OLTx2ONUx2PON-dt.yaml
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON-dt.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml
index c665818..ad8d574 100755
--- a/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
index efca8b8..3a58325 100755
--- a/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON_VGC.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON_VGC.yaml
index cf9841c..a5fd993 100755
--- a/tests/data/bbsim-kind-2OLTx2ONUx2PON_VGC.yaml
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON_VGC.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-2x2.yaml b/tests/data/bbsim-kind-2x2.yaml
index 6241840..4a5f77a 100644
--- a/tests/data/bbsim-kind-2x2.yaml
+++ b/tests/data/bbsim-kind-2x2.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-8x2.yaml b/tests/data/bbsim-kind-8x2.yaml
index 9202b4a..0fe3941 100644
--- a/tests/data/bbsim-kind-8x2.yaml
+++ b/tests/data/bbsim-kind-8x2.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-8x8.yaml b/tests/data/bbsim-kind-8x8.yaml
index a44cc91..b36d5f6 100755
--- a/tests/data/bbsim-kind-8x8.yaml
+++ b/tests/data/bbsim-kind-8x8.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-dt-1OLTx1PONx2ONU.yaml b/tests/data/bbsim-kind-dt-1OLTx1PONx2ONU.yaml
index 2ae1cb6..6bbe579 100755
--- a/tests/data/bbsim-kind-dt-1OLTx1PONx2ONU.yaml
+++ b/tests/data/bbsim-kind-dt-1OLTx1PONx2ONU.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2023 Open Networking Foundation
+# Copyright 2023-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-dt-fttb-1OLTx1PONx2ONUx2UNI.yaml b/tests/data/bbsim-kind-dt-fttb-1OLTx1PONx2ONUx2UNI.yaml
index 1dc635f..41f0593 100644
--- a/tests/data/bbsim-kind-dt-fttb-1OLTx1PONx2ONUx2UNI.yaml
+++ b/tests/data/bbsim-kind-dt-fttb-1OLTx1PONx2ONUx2UNI.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2022-present Open Networking Foundation
+# Copyright 2022-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-dt-vgc.yaml b/tests/data/bbsim-kind-dt-vgc.yaml
index 73824ca..c28e98c 100755
--- a/tests/data/bbsim-kind-dt-vgc.yaml
+++ b/tests/data/bbsim-kind-dt-vgc.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-dt.yaml b/tests/data/bbsim-kind-dt.yaml
index ef35890..16ad6c9 100644
--- a/tests/data/bbsim-kind-dt.yaml
+++ b/tests/data/bbsim-kind-dt.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-multi-uni-2OLTx2ONUx2PON-tt.yaml b/tests/data/bbsim-kind-multi-uni-2OLTx2ONUx2PON-tt.yaml
index 6bd7f85..847a08b 100755
--- a/tests/data/bbsim-kind-multi-uni-2OLTx2ONUx2PON-tt.yaml
+++ b/tests/data/bbsim-kind-multi-uni-2OLTx2ONUx2PON-tt.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-multi-uni-2OLTx2ONUx2PON.yaml b/tests/data/bbsim-kind-multi-uni-2OLTx2ONUx2PON.yaml
index 2d36404..ebe8a51 100755
--- a/tests/data/bbsim-kind-multi-uni-2OLTx2ONUx2PON.yaml
+++ b/tests/data/bbsim-kind-multi-uni-2OLTx2ONUx2PON.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-2022 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-multi-uni-tt.yaml b/tests/data/bbsim-kind-multi-uni-tt.yaml
index bc19afe..d350aae 100755
--- a/tests/data/bbsim-kind-multi-uni-tt.yaml
+++ b/tests/data/bbsim-kind-multi-uni-tt.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-multi-uni.yaml b/tests/data/bbsim-kind-multi-uni.yaml
index b783644..d59ab96 100644
--- a/tests/data/bbsim-kind-multi-uni.yaml
+++ b/tests/data/bbsim-kind-multi-uni.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-tim-2OLTx2PONx2ONU.yaml b/tests/data/bbsim-kind-tim-2OLTx2PONx2ONU.yaml
index af2eecd..139fb3a 100644
--- a/tests/data/bbsim-kind-tim-2OLTx2PONx2ONU.yaml
+++ b/tests/data/bbsim-kind-tim-2OLTx2PONx2ONU.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-tim-Mcast-2OLTx2PONx2UNI-single_multi_Sub.yaml b/tests/data/bbsim-kind-tim-Mcast-2OLTx2PONx2UNI-single_multi_Sub.yaml
index af2eecd..139fb3a 100644
--- a/tests/data/bbsim-kind-tim-Mcast-2OLTx2PONx2UNI-single_multi_Sub.yaml
+++ b/tests/data/bbsim-kind-tim-Mcast-2OLTx2PONx2UNI-single_multi_Sub.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-tim-Mcast.yaml b/tests/data/bbsim-kind-tim-Mcast.yaml
index 35efe20..ecd87b6 100644
--- a/tests/data/bbsim-kind-tim-Mcast.yaml
+++ b/tests/data/bbsim-kind-tim-Mcast.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-tim-OLTx2PONx2ONU.yaml b/tests/data/bbsim-kind-tim-OLTx2PONx2ONU.yaml
index ff67227..0a69a1b 100644
--- a/tests/data/bbsim-kind-tim-OLTx2PONx2ONU.yaml
+++ b/tests/data/bbsim-kind-tim-OLTx2PONx2ONU.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-tim-OLTxPONx2ONU.yaml b/tests/data/bbsim-kind-tim-OLTxPONx2ONU.yaml
index b65a6f7..8e6b96e 100644
--- a/tests/data/bbsim-kind-tim-OLTxPONx2ONU.yaml
+++ b/tests/data/bbsim-kind-tim-OLTxPONx2ONU.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-tim.yaml b/tests/data/bbsim-kind-tim.yaml
index f2aef1d..668448c 100644
--- a/tests/data/bbsim-kind-tim.yaml
+++ b/tests/data/bbsim-kind-tim.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-tt.yaml b/tests/data/bbsim-kind-tt.yaml
index 584ac1b..793bdf0 100755
--- a/tests/data/bbsim-kind-tt.yaml
+++ b/tests/data/bbsim-kind-tt.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind.yaml b/tests/data/bbsim-kind.yaml
index f9ca52a..4cb3887 100644
--- a/tests/data/bbsim-kind.yaml
+++ b/tests/data/bbsim-kind.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/dmi-components-adtran.yaml b/tests/data/dmi-components-adtran.yaml
index 45d0b0b..46d5bb4 100755
--- a/tests/data/dmi-components-adtran.yaml
+++ b/tests/data/dmi-components-adtran.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2020-present Open Networking Foundation
+# Copyright 2020-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/dmi-components-bbsim.yaml b/tests/data/dmi-components-bbsim.yaml
index a0229b1..c7071a5 100755
--- a/tests/data/dmi-components-bbsim.yaml
+++ b/tests/data/dmi-components-bbsim.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2020-present Open Networking Foundation
+# Copyright 2020-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/flex-ocp-cord-TT-multi-tcont-tests-input.yaml b/tests/data/flex-ocp-cord-TT-multi-tcont-tests-input.yaml
index e99c6b2..4a3647a 100644
--- a/tests/data/flex-ocp-cord-TT-multi-tcont-tests-input.yaml
+++ b/tests/data/flex-ocp-cord-TT-multi-tcont-tests-input.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-present Open Networking Foundation
+# Copyright 2021-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/flex-ocp-cord-multi-uni-TT-multicast-tests-input.yaml b/tests/data/flex-ocp-cord-multi-uni-TT-multicast-tests-input.yaml
index 770e174..a610493 100644
--- a/tests/data/flex-ocp-cord-multi-uni-TT-multicast-tests-input.yaml
+++ b/tests/data/flex-ocp-cord-multi-uni-TT-multicast-tests-input.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-present Open Networking Foundation
+# Copyright 2021-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/multiple-bbsim-kind.yaml b/tests/data/multiple-bbsim-kind.yaml
index e3c0dcf..df1a1f9 100755
--- a/tests/data/multiple-bbsim-kind.yaml
+++ b/tests/data/multiple-bbsim-kind.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/onos-values.yaml b/tests/data/onos-values.yaml
index 94539f6..3413c02 100755
--- a/tests/data/onos-values.yaml
+++ b/tests/data/onos-values.yaml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2020-present Open Networking Foundation
+# Copyright 2020-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/open-olt-values.yaml b/tests/data/open-olt-values.yaml
index 2b34000..32576b7 100755
--- a/tests/data/open-olt-values.yaml
+++ b/tests/data/open-olt-values.yaml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2020-present Open Networking Foundation
+# Copyright 2020-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/open-onu-values.yaml b/tests/data/open-onu-values.yaml
index c962da1..0f26d32 100755
--- a/tests/data/open-onu-values.yaml
+++ b/tests/data/open-onu-values.yaml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2020-present Open Networking Foundation
+# Copyright 2020-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/pm-data.yaml b/tests/data/pm-data.yaml
index 0509910..4337bd9 100755
--- a/tests/data/pm-data.yaml
+++ b/tests/data/pm-data.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2021-present Open Networking Foundation
+# Copyright 2021-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/sim-adapter-values.yaml b/tests/data/sim-adapter-values.yaml
index 2b34000..32576b7 100755
--- a/tests/data/sim-adapter-values.yaml
+++ b/tests/data/sim-adapter-values.yaml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2020-present Open Networking Foundation
+# Copyright 2020-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/software-upgrade.yaml b/tests/data/software-upgrade.yaml
index 080a0aa..a0ff335 100644
--- a/tests/data/software-upgrade.yaml
+++ b/tests/data/software-upgrade.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/voltha-values.yaml b/tests/data/voltha-values.yaml
index b811c71..9fb02e1 100755
--- a/tests/data/voltha-values.yaml
+++ b/tests/data/voltha-values.yaml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2020-present Open Networking Foundation
+# Copyright 2020-2024 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.