diff --git a/koans/app/config/PathToEnlightenment.xml b/koans/app/config/PathToEnlightenment.xml
index dd104446..6b4002f3 100755
--- a/koans/app/config/PathToEnlightenment.xml
+++ b/koans/app/config/PathToEnlightenment.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <packages>
-    <package pkg="beginner" name="Novice">
-        <suite class="AboutKoans">
-        <koan name="findAboutKoansFile" displayIncompleteKoanException="false" />
-        <koan name="definitionOfKoanCompletion" displayIncompleteKoanException="false" />
-        </suite>
-        <suite class="AboutAssertions"/>
-        <suite class="AboutEquality"/>
-        <suite class="AboutStrings"/>
-        <suite class="AboutArithmeticOperators"/>
-        <suite class="AboutConditionals"/>
-        <suite class="AboutLoops" />
-        <suite class="AboutPrimitives" />
-        <suite class="AboutObjects"/>
-        <suite class="AboutInheritance"/>
-        <suite class="AboutCasting"/>
-        <suite class="AboutConstructors"/>
-        <suite class="AboutEnums"/>
-        <suite class="AboutExceptions"/>
-        <suite class="AboutMethodPreference"/>
-        <suite class="AboutBitwiseOperators"/>
-        <suite class="AboutArrays"/>
-        <suite class="AboutVarArgs"/>
-    </package>
+<!--    <package pkg="beginner" name="Novice">-->
+<!--        <suite class="AboutKoans">-->
+<!--        <koan name="findAboutKoansFile" displayIncompleteKoanException="false" />-->
+<!--        <koan name="definitionOfKoanCompletion" displayIncompleteKoanException="false" />-->
+<!--        </suite>-->
+<!--        <suite class="AboutAssertions"/>-->
+<!--        <suite class="AboutEquality"/>-->
+<!--        <suite class="AboutStrings"/>-->
+<!--        <suite class="AboutArithmeticOperators"/>-->
+<!--        <suite class="AboutConditionals"/>-->
+<!--        <suite class="AboutLoops" />-->
+<!--        <suite class="AboutPrimitives" />-->
+<!--        <suite class="AboutObjects"/>-->
+<!--        <suite class="AboutInheritance"/>-->
+<!--        <suite class="AboutCasting"/>-->
+<!--        <suite class="AboutConstructors"/>-->
+<!--        <suite class="AboutEnums"/>-->
+<!--        <suite class="AboutExceptions"/>-->
+<!--        <suite class="AboutMethodPreference"/>-->
+<!--        <suite class="AboutBitwiseOperators"/>-->
+<!--        <suite class="AboutArrays"/>-->
+<!--        <suite class="AboutVarArgs"/>-->
+<!--    </package>-->
     <package pkg="intermediate" name="Intermediate">
-        <suite class="AboutAutoboxing"/>
-        <suite class="AboutCollections"/>
-        <suite class="AboutComparison"/>
+<!--        <suite class="AboutAutoboxing"/>-->
+<!--        <suite class="AboutCollections"/>-->
+<!--        <suite class="AboutComparison"/>-->
         <suite class="AboutDates"/>
         <suite class="AboutEquality"/>
         <suite class="AboutFileIO"/>
diff --git a/koans/src/intermediate/AboutDates.java b/koans/src/intermediate/AboutDates.java
index 4f324dee..abafd1c3 100644
--- a/koans/src/intermediate/AboutDates.java
+++ b/koans/src/intermediate/AboutDates.java
@@ -15,7 +15,7 @@
 
 public class AboutDates {
 
-    private LocalDateTime date = LocalDateTime.ofInstant(Instant.ofEpochMilli(100010001000L), ZoneId.systemDefault());
+    private LocalDateTime date = LocalDateTime.ofInstant(Instant.ofEpochMilli(100010001000L), ZoneId.of("-07:00"));
 
     @Koan
     public void dateToString() {
@@ -42,6 +42,7 @@ public void usingDateTimeFormatterToFormatDate() {
 
     @Koan
     public void usingDateTimeFormatterToFormatDateShort() {
+        // Careful, formatted dates may contain non-breaking spaces!
         String formattedDate = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT).format(date);
         assertEquals(formattedDate, __);
     }