diff --git a/cmd/install b/cmd/install
index 37c03e113..4e8639a66 100755
--- a/cmd/install
+++ b/cmd/install
@@ -1,5 +1,19 @@
 #!/bin/bash -e
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 python3 -m venv venv
 
 source venv/bin/activate
diff --git a/cmd/start b/cmd/start
index 17bc2af6c..64ac197eb 100755
--- a/cmd/start
+++ b/cmd/start
@@ -1,5 +1,19 @@
 #!/bin/bash -e
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 if [[ "$EUID" -ne 0 ]]; then
     echo "Must run as root. Use sudo cmd/start"
     exit 1
diff --git a/framework/python/src/test_orc/test_orchestrator.py b/framework/python/src/test_orc/test_orchestrator.py
index 4d39deab8..4bc9fc003 100644
--- a/framework/python/src/test_orc/test_orchestrator.py
+++ b/framework/python/src/test_orc/test_orchestrator.py
@@ -79,9 +79,6 @@ def run_test_modules(self, device):
       self._run_test_module(module, device)
     LOGGER.info("All tests complete")
 
-    # Wait for all containers to stop (this should actually check in future)
-    time.sleep(5)
-
     self._generate_results(device)
     self._test_in_progress = False
 
@@ -90,7 +87,7 @@ def _generate_results(self, device):
     results["device"] = {}
     if device.manufacturer is not None:
       results["device"]["manufacturer"] = device.manufacturer
-    if device.manufacturer is not None:
+    if device.model is not None:
       results["device"]["model"] = device.model
     results["device"]["mac_addr"] = device.mac_addr
     for module in self._test_modules:
diff --git a/modules/devices/faux-dev/bin/get_default_gateway b/modules/devices/faux-dev/bin/get_default_gateway
index f6f1e2a0d..f4d1a4a23 100644
--- a/modules/devices/faux-dev/bin/get_default_gateway
+++ b/modules/devices/faux-dev/bin/get_default_gateway
@@ -1,3 +1,17 @@
 #!/bin/bash -e
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 route | grep default | awk '{print $2}'
\ No newline at end of file
diff --git a/modules/devices/faux-dev/bin/start_dhcp_client b/modules/devices/faux-dev/bin/start_dhcp_client
index de9270c82..90362c4a4 100644
--- a/modules/devices/faux-dev/bin/start_dhcp_client
+++ b/modules/devices/faux-dev/bin/start_dhcp_client
@@ -1,5 +1,19 @@
 #!/bin/bash -e
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Fetch the interface
 INTF=$1
 
diff --git a/modules/devices/faux-dev/bin/start_network_service b/modules/devices/faux-dev/bin/start_network_service
index 80a587684..d4bb8a92d 100644
--- a/modules/devices/faux-dev/bin/start_network_service
+++ b/modules/devices/faux-dev/bin/start_network_service
@@ -1,5 +1,19 @@
 #!/bin/bash -e
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Directory where all binaries will be loaded
 BIN_DIR="/testrun/bin"
 
diff --git a/modules/devices/faux-dev/faux-dev.Dockerfile b/modules/devices/faux-dev/faux-dev.Dockerfile
index 0a4f02f38..ecfdfc5c2 100644
--- a/modules/devices/faux-dev/faux-dev.Dockerfile
+++ b/modules/devices/faux-dev/faux-dev.Dockerfile
@@ -1,3 +1,17 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Image name: test-run/faux-dev
 FROM test-run/base:latest
 
diff --git a/modules/network/base/base.Dockerfile b/modules/network/base/base.Dockerfile
index d14713c59..f8fa43c57 100644
--- a/modules/network/base/base.Dockerfile
+++ b/modules/network/base/base.Dockerfile
@@ -1,3 +1,17 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Image name: test-run/base
 FROM ubuntu:jammy
 
diff --git a/modules/network/base/bin/capture b/modules/network/base/bin/capture
index bc6c425e5..59ffb4118 100644
--- a/modules/network/base/bin/capture
+++ b/modules/network/base/bin/capture
@@ -1,5 +1,19 @@
 #!/bin/bash -e
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Fetch module name
 MODULE_NAME=$1
 
diff --git a/modules/network/base/bin/setup_binaries b/modules/network/base/bin/setup_binaries
index 3535ead3c..6af744693 100644
--- a/modules/network/base/bin/setup_binaries
+++ b/modules/network/base/bin/setup_binaries
@@ -1,5 +1,19 @@
 #!/bin/bash -e
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Directory where all binaries will be loaded
 BIN_DIR=$1
 
diff --git a/modules/network/base/bin/start_grpc b/modules/network/base/bin/start_grpc
index 9792b4bd4..56f915db7 100644
--- a/modules/network/base/bin/start_grpc
+++ b/modules/network/base/bin/start_grpc
@@ -1,5 +1,19 @@
 #!/bin/bash -e
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 GRPC_DIR="/testrun/python/src/grpc"
 GRPC_PROTO_DIR="proto"
 GRPC_PROTO_FILE="grpc.proto"
diff --git a/modules/network/base/bin/start_module b/modules/network/base/bin/start_module
index 7fdcbc404..e00747b43 100644
--- a/modules/network/base/bin/start_module
+++ b/modules/network/base/bin/start_module
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Directory where all binaries will be loaded
 BIN_DIR="/testrun/bin"
 
diff --git a/modules/network/base/bin/start_network_service b/modules/network/base/bin/start_network_service
index 7d13750b8..9cd0a70c2 100644
--- a/modules/network/base/bin/start_network_service
+++ b/modules/network/base/bin/start_network_service
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Place holder function for testing and validation
 # Each network module should include a start_networkig_service
 # file that overwrites this one to boot all of the its specific
diff --git a/modules/network/base/bin/wait_for_interface b/modules/network/base/bin/wait_for_interface
index 1377705d8..a0c8a63b8 100644
--- a/modules/network/base/bin/wait_for_interface
+++ b/modules/network/base/bin/wait_for_interface
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Default interface should be veth0 for all containers
 DEFAULT_IFACE=veth0
 
diff --git a/modules/network/dhcp-1/bin/start_network_service b/modules/network/dhcp-1/bin/start_network_service
index a60806684..fbeede871 100644
--- a/modules/network/dhcp-1/bin/start_network_service
+++ b/modules/network/dhcp-1/bin/start_network_service
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 CONFIG_FILE=/etc/dhcp/dhcpd.conf
 DHCP_PID_FILE=/var/run/dhcpd.pid
 DHCP_LOG_FILE=/runtime/network/dhcp1-dhcpd.log
diff --git a/modules/network/dhcp-1/dhcp-1.Dockerfile b/modules/network/dhcp-1/dhcp-1.Dockerfile
index 766f18c57..a4eb8d90a 100644
--- a/modules/network/dhcp-1/dhcp-1.Dockerfile
+++ b/modules/network/dhcp-1/dhcp-1.Dockerfile
@@ -1,3 +1,17 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Image name: test-run/dhcp-primary
 FROM test-run/base:latest
 
diff --git a/modules/network/dhcp-2/bin/start_network_service b/modules/network/dhcp-2/bin/start_network_service
index ad5ff09e7..550854d49 100644
--- a/modules/network/dhcp-2/bin/start_network_service
+++ b/modules/network/dhcp-2/bin/start_network_service
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 CONFIG_FILE=/etc/dhcp/dhcpd.conf
 DHCP_PID_FILE=/var/run/dhcpd.pid
 DHCP_LOG_FILE=/runtime/network/dhcp2-dhcpd.log
diff --git a/modules/network/dhcp-2/dhcp-2.Dockerfile b/modules/network/dhcp-2/dhcp-2.Dockerfile
index 231d0c558..df77cb811 100644
--- a/modules/network/dhcp-2/dhcp-2.Dockerfile
+++ b/modules/network/dhcp-2/dhcp-2.Dockerfile
@@ -1,3 +1,17 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Image name: test-run/dhcp-primary
 FROM test-run/base:latest
 
diff --git a/modules/network/dns/bin/start_network_service b/modules/network/dns/bin/start_network_service
index 4537033c0..98e75ccff 100644
--- a/modules/network/dns/bin/start_network_service
+++ b/modules/network/dns/bin/start_network_service
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 CONFIG_FILE=/etc/dnsmasq.conf
 PID_FILE=/var/run/dnsmasq.pid
 LOG_FILE=/runtime/network/dns.log
diff --git a/modules/network/dns/dns.Dockerfile b/modules/network/dns/dns.Dockerfile
index edfd4dd03..d59b8a391 100644
--- a/modules/network/dns/dns.Dockerfile
+++ b/modules/network/dns/dns.Dockerfile
@@ -1,3 +1,17 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Image name: test-run/dns
 FROM test-run/base:latest
 
diff --git a/modules/network/gateway/bin/start_network_service b/modules/network/gateway/bin/start_network_service
index b1b31d335..dc456d380 100644
--- a/modules/network/gateway/bin/start_network_service
+++ b/modules/network/gateway/bin/start_network_service
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 LOCAL_INTF=veth0
 EXT_INTF=eth1
 
diff --git a/modules/network/gateway/gateway.Dockerfile b/modules/network/gateway/gateway.Dockerfile
index 9bfa77dae..d15d31610 100644
--- a/modules/network/gateway/gateway.Dockerfile
+++ b/modules/network/gateway/gateway.Dockerfile
@@ -1,3 +1,17 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Image name: test-run/gateway
 FROM test-run/base:latest
 
diff --git a/modules/network/ntp/bin/start_network_service b/modules/network/ntp/bin/start_network_service
index b20cf8831..91129b18f 100644
--- a/modules/network/ntp/bin/start_network_service
+++ b/modules/network/ntp/bin/start_network_service
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 PYTHON_SRC_DIR=/testrun/python/src
 LOG_FILE="/runtime/network/ntp.log"
 
diff --git a/modules/network/ntp/ntp.Dockerfile b/modules/network/ntp/ntp.Dockerfile
index 1add3178e..cfd78c05e 100644
--- a/modules/network/ntp/ntp.Dockerfile
+++ b/modules/network/ntp/ntp.Dockerfile
@@ -1,3 +1,17 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Image name: test-run/ntp
 FROM test-run/base:latest
 
diff --git a/modules/network/radius/bin/start_network_service b/modules/network/radius/bin/start_network_service
index 399a90ae5..d285c20d9 100644
--- a/modules/network/radius/bin/start_network_service
+++ b/modules/network/radius/bin/start_network_service
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 PYTHON_SRC_DIR=/testrun/python/src
 CONF_DIR="/testrun/conf"
 LOG_FILE="/runtime/network/radius.log"
diff --git a/modules/network/radius/radius.Dockerfile b/modules/network/radius/radius.Dockerfile
index c44c5f0cc..4c8f8fac5 100644
--- a/modules/network/radius/radius.Dockerfile
+++ b/modules/network/radius/radius.Dockerfile
@@ -1,3 +1,17 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Image name: test-run/radius
 FROM test-run/base:latest
 
diff --git a/modules/network/template/bin/start_network_service b/modules/network/template/bin/start_network_service
index 94ae0def9..f184338a0 100644
--- a/modules/network/template/bin/start_network_service
+++ b/modules/network/template/bin/start_network_service
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Place holder function for testing and validation
 # Each network module should include a start_networkig_service
 # file that overwrites this one to boot all of the its specific
diff --git a/modules/network/template/template.Dockerfile b/modules/network/template/template.Dockerfile
index 9efbfb230..1c3060496 100644
--- a/modules/network/template/template.Dockerfile
+++ b/modules/network/template/template.Dockerfile
@@ -1,3 +1,17 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Image name: test-run/template
 FROM test-run/base:latest
 
diff --git a/modules/test/base/base.Dockerfile b/modules/test/base/base.Dockerfile
index b8398eae9..9c7f2bac2 100644
--- a/modules/test/base/base.Dockerfile
+++ b/modules/test/base/base.Dockerfile
@@ -1,3 +1,17 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Image name: test-run/base-test
 FROM ubuntu:jammy
 
diff --git a/modules/test/base/bin/capture b/modules/test/base/bin/capture
index 45cfcd42f..69fa916c3 100644
--- a/modules/test/base/bin/capture
+++ b/modules/test/base/bin/capture
@@ -1,5 +1,19 @@
 #!/bin/bash -e
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Fetch module name
 MODULE_NAME=$1
 
diff --git a/modules/test/base/bin/get_ipv4_addr b/modules/test/base/bin/get_ipv4_addr
index 09a19bc13..c244b157d 100644
--- a/modules/test/base/bin/get_ipv4_addr
+++ b/modules/test/base/bin/get_ipv4_addr
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 NET=$1
 MAC=$2
 
diff --git a/modules/test/base/bin/setup_binaries b/modules/test/base/bin/setup_binaries
index 3535ead3c..6af744693 100644
--- a/modules/test/base/bin/setup_binaries
+++ b/modules/test/base/bin/setup_binaries
@@ -1,5 +1,19 @@
 #!/bin/bash -e
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Directory where all binaries will be loaded
 BIN_DIR=$1
 
diff --git a/modules/test/base/bin/start_grpc b/modules/test/base/bin/start_grpc
index 917381e89..7852b8ae3 100644
--- a/modules/test/base/bin/start_grpc
+++ b/modules/test/base/bin/start_grpc
@@ -1,5 +1,19 @@
 #!/bin/bash -e
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 GRPC_DIR="/testrun/python/src/grpc"
 GRPC_PROTO_DIR="proto"
 GRPC_PROTO_FILE="grpc.proto"
diff --git a/modules/test/base/bin/start_module b/modules/test/base/bin/start_module
index 3e4737d8b..5f6e1ee35 100644
--- a/modules/test/base/bin/start_module
+++ b/modules/test/base/bin/start_module
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Define the local mount point to store local files to
 OUTPUT_DIR="/runtime/output"
 
diff --git a/modules/test/base/bin/wait_for_interface b/modules/test/base/bin/wait_for_interface
index c9c1682f0..4c336c8fb 100644
--- a/modules/test/base/bin/wait_for_interface
+++ b/modules/test/base/bin/wait_for_interface
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Allow a user to define an interface by passing it into this script
 INTF=$1
 
diff --git a/modules/test/baseline/baseline.Dockerfile b/modules/test/baseline/baseline.Dockerfile
index c2b32e7b7..f7d21f8c8 100644
--- a/modules/test/baseline/baseline.Dockerfile
+++ b/modules/test/baseline/baseline.Dockerfile
@@ -1,3 +1,17 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Image name: test-run/baseline-test
 FROM test-run/base-test:latest
 
diff --git a/modules/test/baseline/bin/start_test_module b/modules/test/baseline/bin/start_test_module
index a09349cf9..a529c2fcf 100644
--- a/modules/test/baseline/bin/start_test_module
+++ b/modules/test/baseline/bin/start_test_module
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # An example startup script that does the bare minimum to start
 # a test module via a pyhon script. Each test module should include a 
 # start_test_module file that overwrites this one to boot all of its 
diff --git a/modules/test/conn/bin/start_test_module b/modules/test/conn/bin/start_test_module
index 8290c0764..0df510b86 100644
--- a/modules/test/conn/bin/start_test_module
+++ b/modules/test/conn/bin/start_test_module
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Setup and start the connection test module
 
 # Define where the python source files are located
diff --git a/modules/test/conn/conn.Dockerfile b/modules/test/conn/conn.Dockerfile
index 2526b0046..1714f49f2 100644
--- a/modules/test/conn/conn.Dockerfile
+++ b/modules/test/conn/conn.Dockerfile
@@ -1,3 +1,17 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Image name: test-run/conn-test
 FROM test-run/base-test:latest
 
diff --git a/modules/test/dns/bin/start_test_module b/modules/test/dns/bin/start_test_module
index a09349cf9..a529c2fcf 100644
--- a/modules/test/dns/bin/start_test_module
+++ b/modules/test/dns/bin/start_test_module
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # An example startup script that does the bare minimum to start
 # a test module via a pyhon script. Each test module should include a 
 # start_test_module file that overwrites this one to boot all of its 
diff --git a/modules/test/dns/dns.Dockerfile b/modules/test/dns/dns.Dockerfile
index f831d0e2b..b832c2afb 100644
--- a/modules/test/dns/dns.Dockerfile
+++ b/modules/test/dns/dns.Dockerfile
@@ -1,3 +1,17 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Image name: test-run/conn-test
 FROM test-run/base-test:latest
 
diff --git a/modules/test/nmap/bin/start_test_module b/modules/test/nmap/bin/start_test_module
index 333566342..d8cede486 100644
--- a/modules/test/nmap/bin/start_test_module
+++ b/modules/test/nmap/bin/start_test_module
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # An example startup script that does the bare minimum to start
 # a test module via a pyhon script. Each test module should include a 
 # start_test_module file that overwrites this one to boot all of its 
diff --git a/modules/test/nmap/nmap.Dockerfile b/modules/test/nmap/nmap.Dockerfile
index c1a2f96ce..1789da382 100644
--- a/modules/test/nmap/nmap.Dockerfile
+++ b/modules/test/nmap/nmap.Dockerfile
@@ -1,3 +1,17 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Image name: test-run/nmap-test
 FROM test-run/base-test:latest
 
diff --git a/modules/test/nmap/python/src/nmap_module.py b/modules/test/nmap/python/src/nmap_module.py
index ea013f413..f998f302a 100644
--- a/modules/test/nmap/python/src/nmap_module.py
+++ b/modules/test/nmap/python/src/nmap_module.py
@@ -153,13 +153,17 @@ def _add_unknown_ports(self,tests,unallowed_port):
       unknown_service = {port_style:{unallowed_port['port']:result}}
       tests[service_name]=unknown_service
 
-  def _check_scan_results(self, test_config,scan_results):
-    port_config = {}
-    if "tcp_ports" in test_config:
-      port_config.update(test_config["tcp_ports"])
-    elif "udp_ports" in test_config:
-      port_config.update(test_config["udp_ports"])
 
+  def _check_scan_results(self,test_config,scan_results):
+    if "tcp_ports" in test_config:
+      port_config = test_config["tcp_ports"]
+      self._check_scan_result(port_config=port_config,scan_results=scan_results)
+    if "udp_ports" in test_config:
+      port_config = test_config["udp_ports"]
+      self._check_scan_result(port_config=port_config,scan_results=scan_results)
+      
+
+  def _check_scan_result(self,port_config,scan_results):
     if port_config is not None:
       for port, config in port_config.items():
         result = None
diff --git a/testing/docker/ci_baseline/Dockerfile b/testing/docker/ci_baseline/Dockerfile
index 7c3c1eebd..468c6f7a0 100644
--- a/testing/docker/ci_baseline/Dockerfile
+++ b/testing/docker/ci_baseline/Dockerfile
@@ -1,6 +1,20 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 FROM ubuntu:jammy
 
-#Update and get all additional requirements not contained in the base image 
+# Update and get all additional requirements not contained in the base image 
 RUN apt-get update && apt-get -y upgrade
 
 RUN apt-get install -y isc-dhcp-client ntpdate coreutils moreutils inetutils-ping curl jq dnsutils
diff --git a/testing/docker/ci_baseline/entrypoint.sh b/testing/docker/ci_baseline/entrypoint.sh
index bc2da3ec2..0f3301cd8 100755
--- a/testing/docker/ci_baseline/entrypoint.sh
+++ b/testing/docker/ci_baseline/entrypoint.sh
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 OUT=/out/testrun_ci.json
 
 NTP_SERVER=10.10.10.5
diff --git a/testing/test_baseline b/testing/test_baseline
index 36d21fa5e..ac47a5cfa 100755
--- a/testing/test_baseline
+++ b/testing/test_baseline
@@ -1,6 +1,19 @@
-
 #!/bin/bash -e
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 TESTRUN_OUT=/tmp/testrun.log
 
 ifconfig
diff --git a/testing/test_pylint b/testing/test_pylint
index e3ade62b5..5cd1dff73 100755
--- a/testing/test_pylint
+++ b/testing/test_pylint
@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 ERROR_LIMIT=1100
 
 sudo cmd/install