diff --git a/docs/reference/Baseline-groups.md b/docs/reference/Baseline-groups.md
index 8eb49b7..d9b3e19 100644
--- a/docs/reference/Baseline-groups.md
+++ b/docs/reference/Baseline-groups.md
@@ -16,8 +16,8 @@ loading targets:
 
 ## GS64 Components
 
-Hyperspace includes the following components in its Rowan configuration that can be
-used as loading targets:
+Hyperspace includes the following components in its Rowan configuration that
+can be used as loading targets:
 
 - `Deployment` will load all the packages needed in a deployed application
 - `Tests` will load the test cases
diff --git a/rowan/components/Deployment.ston b/rowan/components/Deployment.ston
index d9dce62..dd583e4 100644
--- a/rowan/components/Deployment.ston
+++ b/rowan/components/Deployment.ston
@@ -7,7 +7,7 @@ RwSimpleProjectLoadComponentV2 {
   #packageNames : [
     'Hyperspace-Model',
     'Hyperspace-Extensions',
-    'Hyperspace-GS64-Extensions',
+    'Hyperspace-GS64-Extensions'
   ],
   #conditionalPackageMapSpecs : {
     'gemstone' : {
diff --git a/source/BaselineOfHyperspace/BaselineOfHyperspace.class.st b/source/BaselineOfHyperspace/BaselineOfHyperspace.class.st
index 37d7cfb..5f48680 100644
--- a/source/BaselineOfHyperspace/BaselineOfHyperspace.class.st
+++ b/source/BaselineOfHyperspace/BaselineOfHyperspace.class.st
@@ -50,20 +50,29 @@ BaselineOfHyperspace >> setUpDependencies: spec [
 BaselineOfHyperspace >> setUpPackages: spec [
 
 	spec
-		package: 'Hyperspace-Model' with: [ spec requires: #('Buoy-Deployment' 'Zinc-Core')];
+		package: 'Hyperspace-Model'
+		with: [ spec requires: #( 'Buoy-Deployment' 'Zinc-Core' ) ];
 		group: 'Deployment' with: 'Hyperspace-Model';
-		package: 'Hyperspace-Extensions' with: [ spec requires: 'Hyperspace-Model'];
+		package: 'Hyperspace-Extensions'
+		with: [ spec requires: 'Hyperspace-Model' ];
 		group: 'Deployment' with: 'Hyperspace-Extensions';
-		package: 'Hyperspace-Pharo-Extensions' with: [ spec requires: 'Hyperspace-Model'];
-		group: 'Deployment' with: 'Hyperspace-Pharo-Extensions';
-		package: 'Hyperspace-Model-Tests'
-		with: [ spec requires: #( 'Hyperspace-Model' 'Dependent-SUnit-Extensions' ) ];
+		package: 'Hyperspace-Pharo-Extensions'
+		with: [ spec requires: 'Hyperspace-Model' ];
+		group: 'Deployment' with: 'Hyperspace-Pharo-Extensions'.
+
+	spec
+		package: 'Hyperspace-Model-Tests' with: [
+			spec requires:
+					#( 'Hyperspace-Model' 'Hyperspace-Extensions'
+					   'Hyperspace-Pharo-Extensions' 'Dependent-SUnit-Extensions' ) ];
 		group: 'Tests' with: 'Hyperspace-Model-Tests'.
 
 	spec
-		package: 'Hyperspace-SUnit-Model' with: [ spec requires: 'Buoy-SUnit' ];
+		package: 'Hyperspace-SUnit-Model'
+		with: [ spec requires: 'Buoy-SUnit' ];
 		group: 'Dependent-SUnit-Extensions' with: 'Hyperspace-SUnit-Model';
-		package: 'Hyperspace-SUnit-Model-Tests' with: [ spec requires: 'Hyperspace-SUnit-Model' ];
+		package: 'Hyperspace-SUnit-Model-Tests'
+		with: [ spec requires: 'Hyperspace-SUnit-Model' ];
 		group: 'Tests' with: 'Hyperspace-SUnit-Model-Tests'.
 
 	spec group: 'Tools' with: 'Buoy-Tools'