Merge pull request #70 from 3MFConsortium/develop

merge Develop into Master, Version 2.0
3MFConsortium · Jul 5, 2021 · 85c0da8 · 85c0da8
2 parents fa3b52d + af9df0f
commit 85c0da8
Show file tree

Hide file tree

Showing 249 changed files with 81 additions and 11 deletions.
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,25 @@
+BSD 2-Clause License
+
+Copyright (c) 2019, 3MF Consortium
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
@@ -1,29 +1,33 @@
 # 3MF Conformance Test Suites
-| **Version** | 1.0 |
+| **Version** | 2.0.0 |
 | --- | --- |
 | **Status** | Published |
 
 ## Overview
 
 This repository contains 3MF conformance test suites. Each test suite provides coverage for a specific combination of 3MF Core and Extension Specification requirements:
 
-| **Test Suite** | **Core Specification** | **Production Extension** | **Materials Extension** | **Slice Extension** |
-| --- | --- | --- | --- | --- |
-| Suite 1 | X | X |   | X |
-| Suite 2 | X | X | X |   |
-| Suite 3 | X |   |   |   |
-| Suite 4 | X |   |   | X |
-| Suite 5 | X | X |   |   |
-| Suite 6 | X |   | X |   |
+| **Test Suite** | **Core Spec** | **Production Extension** | **Materials Extension** | **Slice Extension** |**Beam Lattice Extension** |**Secure Content Extension** |
+| --- | --- | --- | --- | --- | --- | --- |
+| Suite 1 | X | X |   | X |   |   |
+| Suite 2 | X | X | X |   |   |   |
+| Suite 3 | X |   |   |   |   |   |
+| Suite 4 | X |   |   | X |   |   |
+| Suite 5 | X | X |   |   |   |   |
+| Suite 6 | X |   | X |   |   |   |
+| Suite 7 |  |    |   |   | X |   |
+| Suite 8 |  |  X |   |   |   | X |
 
 The test suites repository can be downloaded as a zip file under [releases](../../releases).
-Detailed information about the test cases can be found in the [3MF_Test_Specification_v1_0](test_specification/3MF_Test_Specification_v1_0.pdf)-document.
+Detailed information about the test cases can be found in the [3MF_Test_Specification_v2_0_0](test_specification/3MF_Test_Specification_v2_0_0.pdf)-document.
 
 All test cases are based on the following versions of the 3MF specifications:
 * 3MF Core Specification - [Version 1.2.3](https://github.com/3MFConsortium/spec_core/blob/1.2.3/3MF%20Core%20Specification.md)
 * 3MF Materials and Properties Extension - [Version 1.2.1](https://github.com/3MFConsortium/spec_materials/blob/1.2.1/3MF%20Materials%20Extension.md)
 * 3MF Production Extension - [Version 1.1.2](https://github.com/3MFConsortium/spec_production/blob/1.1.2/3MF%20Production%20Extension.md)
-* 3MF Slice Extension - [Version 1.0.2](https://github.com/3MFConsortium/spec_slice/blob/1.0.2/3MF%20Slice%20Extension.md) and 
+* 3MF Slice Extension - [Version 1.0.2](https://github.com/3MFConsortium/spec_slice/blob/1.0.2/3MF%20Slice%20Extension.md) 
+* 3MF Beam Lattice Extension - [Version 1.2.0](https://github.com/3MFConsortium/spec_beamlattice/blob/1.2.0/3MF%20Beam%20Lattice%20Extension.md) 
+* 3MF Secure Content Extension - [Version 1.0.2](https://github.com/3MFConsortium/spec_securecontent/blob/1.0.2/3MF%20Secure%20Content.md) 
 * [Office Open XML File Formats - Open Packaging Conventions - December 2012](https://www.ecma-international.org/news/TC45_current_work/Office%20Open%20XML%20Part%202%20-%20Open%20Packaging%20Conventions.pdf)
 
 

diff --git a/suite1_core_slice_prod/expected_result_album/testsuite1_SPX_expectedresult_thumbnails.pdf b/suite1_core_slice_prod/expected_result_album/testsuite1_SPX_expectedresult_thumbnails.pdf
diff --git a/suite1_core_slice_prod/negative_test_cases/N_SPX_0204_02.3mf b/suite1_core_slice_prod/negative_test_cases/N_SPX_0204_02.3mf
diff --git a/...rod/positive_test_cases/P_SPX_0104_03.3mf → ...rod/negative_test_cases/N_SPX_0208_01.3mf b/...rod/positive_test_cases/P_SPX_0104_03.3mf → ...rod/negative_test_cases/N_SPX_0208_01.3mf
diff --git a/suite1_core_slice_prod/negative_test_cases/N_SPX_0405_04.3mf b/suite1_core_slice_prod/negative_test_cases/N_SPX_0405_04.3mf
diff --git a/suite1_core_slice_prod/positive_test_cases/P_SPX_0101_01.3mf b/suite1_core_slice_prod/positive_test_cases/P_SPX_0101_01.3mf
diff --git a/suite1_core_slice_prod/positive_test_cases/P_SPX_0104_04.3mf b/suite1_core_slice_prod/positive_test_cases/P_SPX_0104_04.3mf
diff --git a/suite1_core_slice_prod/positive_test_cases/P_SPX_0304_04.3mf b/suite1_core_slice_prod/positive_test_cases/P_SPX_0304_04.3mf
diff --git a/suite1_core_slice_prod/positive_test_cases/P_SPX_0312_01.3mf b/suite1_core_slice_prod/positive_test_cases/P_SPX_0312_01.3mf
diff --git a/suite2_core_prod_matl/expected_result_album/testsuite2_xpm_expectedresult_thumbnails.pdf b/suite2_core_prod_matl/expected_result_album/testsuite2_xpm_expectedresult_thumbnails.pdf
diff --git a/suite2_core_prod_matl/negative_test_cases/N_XPM_0204_02.3mf b/suite2_core_prod_matl/negative_test_cases/N_XPM_0204_02.3mf
diff --git a/...atl/positive_test_cases/P_XPM_0104_03.3mf → ...atl/negative_test_cases/N_XPM_0208_01.3mf b/...atl/positive_test_cases/P_XPM_0104_03.3mf → ...atl/negative_test_cases/N_XPM_0208_01.3mf
diff --git a/suite2_core_prod_matl/negative_test_cases/N_XPM_0208_02.3mf b/suite2_core_prod_matl/negative_test_cases/N_XPM_0208_02.3mf
diff --git a/suite2_core_prod_matl/negative_test_cases/N_XPM_0405_04.3mf b/suite2_core_prod_matl/negative_test_cases/N_XPM_0405_04.3mf
diff --git a/suite2_core_prod_matl/positive_test_cases/P_XPM_0104_04.3mf b/suite2_core_prod_matl/positive_test_cases/P_XPM_0104_04.3mf
diff --git a/suite2_core_prod_matl/positive_test_cases/P_XPM_0104_05.3mf b/suite2_core_prod_matl/positive_test_cases/P_XPM_0104_05.3mf
diff --git a/suite2_core_prod_matl/positive_test_cases/P_XPM_0304_04.3mf b/suite2_core_prod_matl/positive_test_cases/P_XPM_0304_04.3mf
diff --git a/suite2_core_prod_matl/positive_test_cases/P_XPM_0506_01.3mf b/suite2_core_prod_matl/positive_test_cases/P_XPM_0506_01.3mf
diff --git a/suite3_core/expected_result_album/testsuite3_XXX_expectedresult_thumbnails.pdf b/suite3_core/expected_result_album/testsuite3_XXX_expectedresult_thumbnails.pdf
diff --git a/suite3_core/negative_test_cases/N_XXX_0204_02.3mf b/suite3_core/negative_test_cases/N_XXX_0204_02.3mf
diff --git a/...ore/positive_test_cases/P_XXX_0104_03.3mf → ...ore/negative_test_cases/N_XXX_0208_01.3mf b/...ore/positive_test_cases/P_XXX_0104_03.3mf → ...ore/negative_test_cases/N_XXX_0208_01.3mf
diff --git a/suite3_core/negative_test_cases/N_XXX_0405_04.3mf b/suite3_core/negative_test_cases/N_XXX_0405_04.3mf
diff --git a/suite3_core/positive_test_cases/P_XXX_0101_01.3mf b/suite3_core/positive_test_cases/P_XXX_0101_01.3mf
diff --git a/suite3_core/positive_test_cases/P_XXX_0104_04.3mf b/suite3_core/positive_test_cases/P_XXX_0104_04.3mf
diff --git a/suite3_core/positive_test_cases/P_XXX_0304_04.3mf b/suite3_core/positive_test_cases/P_XXX_0304_04.3mf
diff --git a/suite3_core/positive_test_cases/P_XXX_0312_01.3mf b/suite3_core/positive_test_cases/P_XXX_0312_01.3mf
diff --git a/suite4_core_slice/expected_result_album/testsuite4_SXX_expectedresult_thumbnails.pdf b/suite4_core_slice/expected_result_album/testsuite4_SXX_expectedresult_thumbnails.pdf
diff --git a/suite4_core_slice/negative_test_cases/N_SXX_0204_02.3mf b/suite4_core_slice/negative_test_cases/N_SXX_0204_02.3mf
diff --git a/...ice/positive_test_cases/P_SXX_0104_03.3mf → ...ice/negative_test_cases/N_SXX_0208_01.3mf b/...ice/positive_test_cases/P_SXX_0104_03.3mf → ...ice/negative_test_cases/N_SXX_0208_01.3mf
diff --git a/suite4_core_slice/negative_test_cases/N_SXX_0405_04.3mf b/suite4_core_slice/negative_test_cases/N_SXX_0405_04.3mf
diff --git a/suite4_core_slice/positive_test_cases/P_SXX_0101_01.3mf b/suite4_core_slice/positive_test_cases/P_SXX_0101_01.3mf
diff --git a/suite4_core_slice/positive_test_cases/P_SXX_0104_04.3mf b/suite4_core_slice/positive_test_cases/P_SXX_0104_04.3mf
diff --git a/suite4_core_slice/positive_test_cases/P_SXX_0304_04.3mf b/suite4_core_slice/positive_test_cases/P_SXX_0304_04.3mf
diff --git a/suite4_core_slice/positive_test_cases/P_SXX_0312_01.3mf b/suite4_core_slice/positive_test_cases/P_SXX_0312_01.3mf
diff --git a/...tsuite5_XXM_expectedresult_thumbnails.pdf → ...tsuite5_xpx_expectedresult_thumbnails.pdf b/...tsuite5_XXM_expectedresult_thumbnails.pdf → ...tsuite5_xpx_expectedresult_thumbnails.pdf
diff --git a/suite5_core_prod/negative_test_cases/N_XPX_0204_02.3mf b/suite5_core_prod/negative_test_cases/N_XPX_0204_02.3mf
diff --git a/...rod/positive_test_cases/P_XPX_0104_03.3mf → ...rod/negative_test_cases/N_XPX_0208_01.3mf b/...rod/positive_test_cases/P_XPX_0104_03.3mf → ...rod/negative_test_cases/N_XPX_0208_01.3mf
diff --git a/suite5_core_prod/negative_test_cases/N_XPX_0405_04.3mf b/suite5_core_prod/negative_test_cases/N_XPX_0405_04.3mf
diff --git a/suite5_core_prod/positive_test_cases/P_XPX_0104_04.3mf b/suite5_core_prod/positive_test_cases/P_XPX_0104_04.3mf
diff --git a/suite5_core_prod/positive_test_cases/P_XPX_0304_04.3mf b/suite5_core_prod/positive_test_cases/P_XPX_0304_04.3mf
diff --git a/suite5_core_prod/positive_test_cases/P_XPX_0312_01.3mf b/suite5_core_prod/positive_test_cases/P_XPX_0312_01.3mf
diff --git a/suite6_core_matl/expected_result_album/testsuite6_XXM_expectedresult_thumbnails.pdf b/suite6_core_matl/expected_result_album/testsuite6_XXM_expectedresult_thumbnails.pdf
diff --git a/suite6_core_matl/negative_test_cases/N_XXM_0204_02.3mf b/suite6_core_matl/negative_test_cases/N_XXM_0204_02.3mf
diff --git a/...atl/positive_test_cases/P_XXM_0104_03.3mf → ...atl/negative_test_cases/N_XXM_0208_01.3mf b/...atl/positive_test_cases/P_XXM_0104_03.3mf → ...atl/negative_test_cases/N_XXM_0208_01.3mf
diff --git a/suite6_core_matl/negative_test_cases/N_XXM_0208_02.3mf b/suite6_core_matl/negative_test_cases/N_XXM_0208_02.3mf
diff --git a/suite6_core_matl/negative_test_cases/N_XXM_0405_04.3mf b/suite6_core_matl/negative_test_cases/N_XXM_0405_04.3mf
diff --git a/suite6_core_matl/positive_test_cases/P_XXM_0104_04.3mf b/suite6_core_matl/positive_test_cases/P_XXM_0104_04.3mf
diff --git a/suite6_core_matl/positive_test_cases/P_XXM_0104_05.3mf b/suite6_core_matl/positive_test_cases/P_XXM_0104_05.3mf
diff --git a/suite6_core_matl/positive_test_cases/P_XXM_0304_04.3mf b/suite6_core_matl/positive_test_cases/P_XXM_0304_04.3mf
diff --git a/suite6_core_matl/positive_test_cases/P_XXM_0506_01.3mf b/suite6_core_matl/positive_test_cases/P_XXM_0506_01.3mf
diff --git a/suite7_beam/expected_result_album/testsuite7_bxx_expectedresult_large_thumbnails.pdf b/suite7_beam/expected_result_album/testsuite7_bxx_expectedresult_large_thumbnails.pdf
diff --git a/suite7_beam/expected_result_album/testsuite7_bxx_expectedresult_thumbnails.pdf b/suite7_beam/expected_result_album/testsuite7_bxx_expectedresult_thumbnails.pdf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2501_01.3mf b/suite7_beam/negative_test_cases/N_BXX_2501_01.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2501_02.3mf b/suite7_beam/negative_test_cases/N_BXX_2501_02.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2501_03.3mf b/suite7_beam/negative_test_cases/N_BXX_2501_03.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2501_04.3mf b/suite7_beam/negative_test_cases/N_BXX_2501_04.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2502_01.3mf b/suite7_beam/negative_test_cases/N_BXX_2502_01.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2502_02.3mf b/suite7_beam/negative_test_cases/N_BXX_2502_02.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2502_03.3mf b/suite7_beam/negative_test_cases/N_BXX_2502_03.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2502_04.3mf b/suite7_beam/negative_test_cases/N_BXX_2502_04.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2502_05.3mf b/suite7_beam/negative_test_cases/N_BXX_2502_05.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2502_06.3mf b/suite7_beam/negative_test_cases/N_BXX_2502_06.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2503_02.3mf b/suite7_beam/negative_test_cases/N_BXX_2503_02.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2503_03.3mf b/suite7_beam/negative_test_cases/N_BXX_2503_03.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2503_04.3mf b/suite7_beam/negative_test_cases/N_BXX_2503_04.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2503_05.3mf b/suite7_beam/negative_test_cases/N_BXX_2503_05.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2503_06.3mf b/suite7_beam/negative_test_cases/N_BXX_2503_06.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2503_07.3mf b/suite7_beam/negative_test_cases/N_BXX_2503_07.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2503_08.3mf b/suite7_beam/negative_test_cases/N_BXX_2503_08.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2504_01.3mf b/suite7_beam/negative_test_cases/N_BXX_2504_01.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2504_02.3mf b/suite7_beam/negative_test_cases/N_BXX_2504_02.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2504_03.3mf b/suite7_beam/negative_test_cases/N_BXX_2504_03.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2504_04.3mf b/suite7_beam/negative_test_cases/N_BXX_2504_04.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2504_05.3mf b/suite7_beam/negative_test_cases/N_BXX_2504_05.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2505_01.3mf b/suite7_beam/negative_test_cases/N_BXX_2505_01.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2505_02.3mf b/suite7_beam/negative_test_cases/N_BXX_2505_02.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2505_03.3mf b/suite7_beam/negative_test_cases/N_BXX_2505_03.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2505_04.3mf b/suite7_beam/negative_test_cases/N_BXX_2505_04.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2506_01.3mf b/suite7_beam/negative_test_cases/N_BXX_2506_01.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2506_02.3mf b/suite7_beam/negative_test_cases/N_BXX_2506_02.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2506_03.3mf b/suite7_beam/negative_test_cases/N_BXX_2506_03.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2506_04.3mf b/suite7_beam/negative_test_cases/N_BXX_2506_04.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2506_05.3mf b/suite7_beam/negative_test_cases/N_BXX_2506_05.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2506_06.3mf b/suite7_beam/negative_test_cases/N_BXX_2506_06.3mf
diff --git a/suite7_beam/negative_test_cases/N_BXX_2506_07.3mf b/suite7_beam/negative_test_cases/N_BXX_2506_07.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2001_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2001_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2001_02.3mf b/suite7_beam/positive_test_cases/P_BXX_2001_02.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2001_03.3mf b/suite7_beam/positive_test_cases/P_BXX_2001_03.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2002_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2002_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2002_02.3mf b/suite7_beam/positive_test_cases/P_BXX_2002_02.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2002_03.3mf b/suite7_beam/positive_test_cases/P_BXX_2002_03.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2002_04.3mf b/suite7_beam/positive_test_cases/P_BXX_2002_04.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2002_05.3mf b/suite7_beam/positive_test_cases/P_BXX_2002_05.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2002_06.3mf b/suite7_beam/positive_test_cases/P_BXX_2002_06.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2003_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2003_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2003_02.3mf b/suite7_beam/positive_test_cases/P_BXX_2003_02.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2003_03.3mf b/suite7_beam/positive_test_cases/P_BXX_2003_03.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2004_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2004_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2004_02.3mf b/suite7_beam/positive_test_cases/P_BXX_2004_02.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2004_03.3mf b/suite7_beam/positive_test_cases/P_BXX_2004_03.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2004_04.3mf b/suite7_beam/positive_test_cases/P_BXX_2004_04.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2004_05.3mf b/suite7_beam/positive_test_cases/P_BXX_2004_05.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2004_06.3mf b/suite7_beam/positive_test_cases/P_BXX_2004_06.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2004_07.3mf b/suite7_beam/positive_test_cases/P_BXX_2004_07.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2004_08.3mf b/suite7_beam/positive_test_cases/P_BXX_2004_08.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2004_09.3mf b/suite7_beam/positive_test_cases/P_BXX_2004_09.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2004_10.3mf b/suite7_beam/positive_test_cases/P_BXX_2004_10.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2004_11.3mf b/suite7_beam/positive_test_cases/P_BXX_2004_11.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2004_12.3mf b/suite7_beam/positive_test_cases/P_BXX_2004_12.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2005_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2005_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2006_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2006_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2006_02.3mf b/suite7_beam/positive_test_cases/P_BXX_2006_02.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2006_03.3mf b/suite7_beam/positive_test_cases/P_BXX_2006_03.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2006_04.3mf b/suite7_beam/positive_test_cases/P_BXX_2006_04.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2006_05.3mf b/suite7_beam/positive_test_cases/P_BXX_2006_05.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2007_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2007_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2007_02.3mf b/suite7_beam/positive_test_cases/P_BXX_2007_02.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2008_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2008_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2008_02.3mf b/suite7_beam/positive_test_cases/P_BXX_2008_02.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2008_03.3mf b/suite7_beam/positive_test_cases/P_BXX_2008_03.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2008_04.3mf b/suite7_beam/positive_test_cases/P_BXX_2008_04.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2008_05.3mf b/suite7_beam/positive_test_cases/P_BXX_2008_05.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2009_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2009_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2009_02.3mf b/suite7_beam/positive_test_cases/P_BXX_2009_02.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2009_03.3mf b/suite7_beam/positive_test_cases/P_BXX_2009_03.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2010_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2010_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2010_02.3mf b/suite7_beam/positive_test_cases/P_BXX_2010_02.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2010_03.3mf b/suite7_beam/positive_test_cases/P_BXX_2010_03.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2010_04.3mf b/suite7_beam/positive_test_cases/P_BXX_2010_04.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2011_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2011_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2011_02.3mf b/suite7_beam/positive_test_cases/P_BXX_2011_02.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2011_03.3mf b/suite7_beam/positive_test_cases/P_BXX_2011_03.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2012_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2012_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2012_02.3mf b/suite7_beam/positive_test_cases/P_BXX_2012_02.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2012_03.3mf b/suite7_beam/positive_test_cases/P_BXX_2012_03.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2012_04.3mf b/suite7_beam/positive_test_cases/P_BXX_2012_04.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2012_05.3mf b/suite7_beam/positive_test_cases/P_BXX_2012_05.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2012_06.3mf b/suite7_beam/positive_test_cases/P_BXX_2012_06.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2012_07.3mf b/suite7_beam/positive_test_cases/P_BXX_2012_07.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2013_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2013_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2013_02.3mf b/suite7_beam/positive_test_cases/P_BXX_2013_02.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2013_03.3mf b/suite7_beam/positive_test_cases/P_BXX_2013_03.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2014_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2014_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2014_02.3mf b/suite7_beam/positive_test_cases/P_BXX_2014_02.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2015_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2015_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2015_02.3mf b/suite7_beam/positive_test_cases/P_BXX_2015_02.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2015_03.3mf b/suite7_beam/positive_test_cases/P_BXX_2015_03.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2015_04.3mf b/suite7_beam/positive_test_cases/P_BXX_2015_04.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2015_05.3mf b/suite7_beam/positive_test_cases/P_BXX_2015_05.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2015_06.3mf b/suite7_beam/positive_test_cases/P_BXX_2015_06.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2015_07.3mf b/suite7_beam/positive_test_cases/P_BXX_2015_07.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2016_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2016_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2017_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2017_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2018_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2018_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2018_02.3mf b/suite7_beam/positive_test_cases/P_BXX_2018_02.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2018_03.3mf b/suite7_beam/positive_test_cases/P_BXX_2018_03.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2018_04.3mf b/suite7_beam/positive_test_cases/P_BXX_2018_04.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2019_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2019_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2019_02.3mf b/suite7_beam/positive_test_cases/P_BXX_2019_02.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2019_03.3mf b/suite7_beam/positive_test_cases/P_BXX_2019_03.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2019_04.3mf b/suite7_beam/positive_test_cases/P_BXX_2019_04.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2020_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2020_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2020_02.3mf b/suite7_beam/positive_test_cases/P_BXX_2020_02.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2020_03.3mf b/suite7_beam/positive_test_cases/P_BXX_2020_03.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2020_04.3mf b/suite7_beam/positive_test_cases/P_BXX_2020_04.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2020_05.3mf b/suite7_beam/positive_test_cases/P_BXX_2020_05.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2021_01.3mf b/suite7_beam/positive_test_cases/P_BXX_2021_01.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2021_02.3mf b/suite7_beam/positive_test_cases/P_BXX_2021_02.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2021_03.3mf b/suite7_beam/positive_test_cases/P_BXX_2021_03.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2021_04.3mf b/suite7_beam/positive_test_cases/P_BXX_2021_04.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2021_05.3mf b/suite7_beam/positive_test_cases/P_BXX_2021_05.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2021_06.3mf b/suite7_beam/positive_test_cases/P_BXX_2021_06.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2021_07.3mf b/suite7_beam/positive_test_cases/P_BXX_2021_07.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2021_08.3mf b/suite7_beam/positive_test_cases/P_BXX_2021_08.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2021_09.3mf b/suite7_beam/positive_test_cases/P_BXX_2021_09.3mf
diff --git a/suite7_beam/positive_test_cases/P_BXX_2021_10.3mf b/suite7_beam/positive_test_cases/P_BXX_2021_10.3mf
diff --git a/suite7_beam/readme.txt b/suite7_beam/readme.txt
@@ -0,0 +1 @@
+Note that the beam lattice test suite does not contain tests for the 3MF Core specification requirements, so the OPC and Core test cases should be run from Suite3_Core in addition to the beam lattice test cases.
diff --git a/suite8_secure/expected_result_album/testsuite8_epx_expectedresult_thumbnails.pdf b/suite8_secure/expected_result_album/testsuite8_epx_expectedresult_thumbnails.pdf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2601_01.3mf b/suite8_secure/negative_test_cases/N_EPX_2601_01.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2602_01.3mf b/suite8_secure/negative_test_cases/N_EPX_2602_01.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2602_02.3mf b/suite8_secure/negative_test_cases/N_EPX_2602_02.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2602_03.3mf b/suite8_secure/negative_test_cases/N_EPX_2602_03.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2602_04.3mf b/suite8_secure/negative_test_cases/N_EPX_2602_04.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2603_01.3mf b/suite8_secure/negative_test_cases/N_EPX_2603_01.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2603_02.3mf b/suite8_secure/negative_test_cases/N_EPX_2603_02.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2603_03.3mf b/suite8_secure/negative_test_cases/N_EPX_2603_03.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2603_04.3mf b/suite8_secure/negative_test_cases/N_EPX_2603_04.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2603_05.3mf b/suite8_secure/negative_test_cases/N_EPX_2603_05.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2603_06.3mf b/suite8_secure/negative_test_cases/N_EPX_2603_06.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2603_07.3mf b/suite8_secure/negative_test_cases/N_EPX_2603_07.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2603_08.3mf b/suite8_secure/negative_test_cases/N_EPX_2603_08.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2604_01.3mf b/suite8_secure/negative_test_cases/N_EPX_2604_01.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2604_02.3mf b/suite8_secure/negative_test_cases/N_EPX_2604_02.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2604_03.3mf b/suite8_secure/negative_test_cases/N_EPX_2604_03.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2604_04.3mf b/suite8_secure/negative_test_cases/N_EPX_2604_04.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2605_01.3mf b/suite8_secure/negative_test_cases/N_EPX_2605_01.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2605_02.3mf b/suite8_secure/negative_test_cases/N_EPX_2605_02.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2605_03.3mf b/suite8_secure/negative_test_cases/N_EPX_2605_03.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2605_04.3mf b/suite8_secure/negative_test_cases/N_EPX_2605_04.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2605_05.3mf b/suite8_secure/negative_test_cases/N_EPX_2605_05.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2605_06.3mf b/suite8_secure/negative_test_cases/N_EPX_2605_06.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2605_07.3mf b/suite8_secure/negative_test_cases/N_EPX_2605_07.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2606_01.3mf b/suite8_secure/negative_test_cases/N_EPX_2606_01.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2606_02.3mf b/suite8_secure/negative_test_cases/N_EPX_2606_02.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2606_03.3mf b/suite8_secure/negative_test_cases/N_EPX_2606_03.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2607_01.3mf b/suite8_secure/negative_test_cases/N_EPX_2607_01.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2607_02.3mf b/suite8_secure/negative_test_cases/N_EPX_2607_02.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2607_03.3mf b/suite8_secure/negative_test_cases/N_EPX_2607_03.3mf
diff --git a/suite8_secure/negative_test_cases/N_EPX_2607_04.3mf b/suite8_secure/negative_test_cases/N_EPX_2607_04.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2101_01.3mf b/suite8_secure/positive_test_cases/P_EPX_2101_01.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2101_02.3mf b/suite8_secure/positive_test_cases/P_EPX_2101_02.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2101_03.3mf b/suite8_secure/positive_test_cases/P_EPX_2101_03.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2102_01_materialExt.3mf b/suite8_secure/positive_test_cases/P_EPX_2102_01_materialExt.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2102_02_sliceExt.3mf b/suite8_secure/positive_test_cases/P_EPX_2102_02_sliceExt.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2103_01.3mf b/suite8_secure/positive_test_cases/P_EPX_2103_01.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2104_01.3mf b/suite8_secure/positive_test_cases/P_EPX_2104_01.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2104_02.3mf b/suite8_secure/positive_test_cases/P_EPX_2104_02.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2104_03.3mf b/suite8_secure/positive_test_cases/P_EPX_2104_03.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2104_04.3mf b/suite8_secure/positive_test_cases/P_EPX_2104_04.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2104_05.3mf b/suite8_secure/positive_test_cases/P_EPX_2104_05.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2105_01.3mf b/suite8_secure/positive_test_cases/P_EPX_2105_01.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2105_02.3mf b/suite8_secure/positive_test_cases/P_EPX_2105_02.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2105_03.3mf b/suite8_secure/positive_test_cases/P_EPX_2105_03.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2106_01.3mf b/suite8_secure/positive_test_cases/P_EPX_2106_01.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2106_02.3mf b/suite8_secure/positive_test_cases/P_EPX_2106_02.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2106_03.3mf b/suite8_secure/positive_test_cases/P_EPX_2106_03.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2106_04.3mf b/suite8_secure/positive_test_cases/P_EPX_2106_04.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2106_05.3mf b/suite8_secure/positive_test_cases/P_EPX_2106_05.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2107_01.3mf b/suite8_secure/positive_test_cases/P_EPX_2107_01.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2107_02.3mf b/suite8_secure/positive_test_cases/P_EPX_2107_02.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2107_03.3mf b/suite8_secure/positive_test_cases/P_EPX_2107_03.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2107_04.3mf b/suite8_secure/positive_test_cases/P_EPX_2107_04.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2108_01.3mf b/suite8_secure/positive_test_cases/P_EPX_2108_01.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2108_02.3mf b/suite8_secure/positive_test_cases/P_EPX_2108_02.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2108_03.3mf b/suite8_secure/positive_test_cases/P_EPX_2108_03.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2109_01.3mf b/suite8_secure/positive_test_cases/P_EPX_2109_01.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2110_01.3mf b/suite8_secure/positive_test_cases/P_EPX_2110_01.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2110_02.3mf b/suite8_secure/positive_test_cases/P_EPX_2110_02.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2110_03.3mf b/suite8_secure/positive_test_cases/P_EPX_2110_03.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2111_01.3mf b/suite8_secure/positive_test_cases/P_EPX_2111_01.3mf
diff --git a/suite8_secure/positive_test_cases/P_EPX_2111_02.3mf b/suite8_secure/positive_test_cases/P_EPX_2111_02.3mf
diff --git a/suite8_secure/readme.txt b/suite8_secure/readme.txt
@@ -0,0 +1 @@
+Note that the secure content test suite does not contain tests for the 3MF Core specification requirements nor a full set of production extension test cases, so all test cases should be run from Suite5_Core_Prod in addition to the secure content test cases.
diff --git a/suite8_secure/test_keys/private_test.pem b/suite8_secure/test_keys/private_test.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAubdl5ZV99+wA/1vUZeeM8KQaSQ7dV0W9Vw7PNlXszRdoavwW
+4D/e70cajoeJ3TJfarA9zdE3pBVzXsja5VM1axzrPCQn77VvFFTLsMa1lBz3UZck
+KK7dAVuoREQCH6042/4UGhvKmVoGq9jt0xMV0CBIgWNgfviE6tuiiezGkoPEJXBb
+hg0WXNe6JSxYI3fRkjjPh8fHSla5Jil6L+XrT/n6ehShlLN960tn8suxu1AaXuRv
+dimZNxVgK7VQKcYQbfKDfpzEi5Jfd2UKxmuKn/87nrreFYaZCeTjFbadP7FkB8wd
+SGGCctsdRfkl/pCBkdLrGsv7Is6jRlW7M0ZoBQIDAQABAoIBAAHH8Pm5K8qXYFES
+m+BYTqE2KaxesJ+4Iv81PKZ8P3eeDFnOThfbdPNdfrM0OI2/AGxBAW66XWq86+zS
+R0sgt6ft0JG0lQ928XhD8eohlbc0aejF5spfFu5+5we0kUKlgiCV+LJhZtl+pAa8
+31cBXVmwHZHkFpZRItEvxwjElQjtp1co+kmCudew4ffpPBPUw7TSuOWuQVjo+d5M
+h0xaZzMjjxSornv4LRAm1D4NoCabuCx7jRY2gOgl39nwCWi922vssbEjAUg4+862
+Jqe/ted4xIGCk8DP+bwxj3WboLjkM4yp/5AcLGkaovhjupLXru4wDqsWr8wbgwV1
+BmzUydcCgYEAvDaO6t58uk0kWVEmlGEueln4AfIUjgjo51qbbb23WsPQTZtlp7N0
+/qNNKsWktr0ZPRIdIFcxTprd+gy5LGozQGz41J2lT+9DGsmo3dB2e47r+uKDnNwm
+Iegp+4LYFiXGLGDNonn7ESSec4Xj8z8YosVHskr64ptPCOzYzmDCkW8CgYEA/Jqj
+wLKOYgBVoUTEZQfMe295VKaKrxtqprYCTHF9J9lysxg2WfIVJByoVnpkmy2EI+Mw
++ubtPrx71Cx413dem/S1aOOIsqJPqdFkc+AERV6ZeT1NWLCgzWoczW/N5ZdneUkW
+a0i0B0olAiC9b5zx9HB+p1bm7xEL3zL6OUDPu8sCgYBflkXXOs+Vvn/rbK9vRDva
+n765Hj0aNaQze2zcuzFXw4MTJwzlstqESGN0iZQxyq/6uCxatG2yQiziRXv19qm4
+2p81PCstAZLPFAPTQ4ApGFj4vfmhvJ0RM1u/BKDB/sU63J8TGWhNOI/Qk/tFGpJk
+eFUFU9c/JylomwExLyshuQKBgFd2o+SA7tP4Ea45RVdGEANdYcFxuOtQrujydHFL
+im5V2GUyqP8T10YdthvbXSJt7CcQ71CwzMzALpAUpfLVHikZ3gZnYlmX4cWG/yUw
+F8p9Kt7T3wgqgEMfzsFDSSOJ/QX9zIlxLwSnI5FNDMqsqQpeOTxv1p5IZLfvyrww
+OL1pAoGAM/ZoL7qWenZAzD1Gdzo9HlrxlxBJPnr+ZdYqrJZdo/TwARY8LZu07Vsu
+aY1ZAqLlkBARRtypmGj04PGbWWRZ3Pn/M5/FgjGa5M9hVnvLJSBklE7tfKLB4KL5
+eMADI7JuelOqfKBxXrp8IlzVlU8Mk0VQRw6hjq1zNKLJtD4EFq4=
+-----END RSA PRIVATE KEY-----
diff --git a/suite8_secure/test_keys/public_test.pem b/suite8_secure/test_keys/public_test.pem
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAubdl5ZV99+wA/1vUZeeM
+8KQaSQ7dV0W9Vw7PNlXszRdoavwW4D/e70cajoeJ3TJfarA9zdE3pBVzXsja5VM1
+axzrPCQn77VvFFTLsMa1lBz3UZckKK7dAVuoREQCH6042/4UGhvKmVoGq9jt0xMV
+0CBIgWNgfviE6tuiiezGkoPEJXBbhg0WXNe6JSxYI3fRkjjPh8fHSla5Jil6L+Xr
+T/n6ehShlLN960tn8suxu1AaXuRvdimZNxVgK7VQKcYQbfKDfpzEi5Jfd2UKxmuK
+n/87nrreFYaZCeTjFbadP7FkB8wdSGGCctsdRfkl/pCBkdLrGsv7Is6jRlW7M0Zo
+BQIDAQAB
+-----END PUBLIC KEY-----
diff --git a/suite8_secure/test_keys/readme.txt b/suite8_secure/test_keys/readme.txt
@@ -0,0 +1,3 @@
+The consumer under test should behave as if it is identified by the consumerid="test3mf01", even though for their production code could use a different consumerid. Secondly, the consumer under test should embed the test private key  and map this to keyid= “test3mfkek01” in order to be able to decrypt the test case’s encrypted content.
+
+The consumerid and keyid noted above will be stored in the test case keystore part and these identifiers will be mapped to all encrypted content that the consumer under test is expected to decrypt unless noted otherwise.  
diff --git a/test_specification/3MF_Test_Specification_v1_0.pdf b/test_specification/3MF_Test_Specification_v1_0.pdf
diff --git a/...fication/3MF_Test_Specification_v1_0.docx → ...cation/3MF_Test_Specification_v2_0_0.docx b/...fication/3MF_Test_Specification_v1_0.docx → ...cation/3MF_Test_Specification_v2_0_0.docx
diff --git a/test_specification/3MF_Test_Specification_v2_0_0.pdf b/test_specification/3MF_Test_Specification_v2_0_0.pdf
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Note that the beam lattice test suite does not contain tests for the 3MF Core specification requirements, so the OPC and Core test cases should be run from Suite3_Core in addition to the beam lattice test cases.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Note that the secure content test suite does not contain tests for the 3MF Core specification requirements nor a full set of production extension test cases, so all test cases should be run from Suite5_Core_Prod in addition to the secure content test cases.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		The consumer under test should behave as if it is identified by the consumerid="test3mf01", even though for their production code could use a different consumerid. Secondly, the consumer under test should embed the test private key and map this to keyid= “test3mfkek01” in order to be able to decrypt the test case’s encrypted content.

		The consumerid and keyid noted above will be stored in the test case keystore part and these identifiers will be mapped to all encrypted content that the consumer under test is expected to decrypt unless noted otherwise.