diff --git "a/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/Test$name__Camel$.tdml" "b/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/Test$name__Camel$.tdml"
index d897b72..75d1a4f 100644
--- "a/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/Test$name__Camel$.tdml"
+++ "b/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/Test$name__Camel$.tdml"
@@ -28,10 +28,10 @@
 
   <tdml:parserTestCase name="test_$name;format="camel"$_01" root="$name;format="Camel"$" model="$if(namespaced.truthy)$$package;format="packaged"$/$name;format="camel"$/xsd/$endif$$name;format="camel"$.dfdl.xsd">
     <tdml:document>
-      <tdml:documentPart type="file">$if(namespaced.truthy)$$package;format="packaged"$/$name;format="camel"$/$endif$data/test_01.$name;format="camel"$</tdml:documentPart>
+      <tdml:documentPart type="file">test_01.$name;format="camel"$</tdml:documentPart>
     </tdml:document>
     <tdml:infoset>
-      <tdml:dfdlInfoset type="file">$if(namespaced.truthy)$$package;format="packaged"$/$name;format="camel"$/$endif$infosets/test_01.$name;format="camel"$.xml</tdml:dfdlInfoset>
+      <tdml:dfdlInfoset type="file">test_01.$name;format="camel"$.xml</tdml:dfdlInfoset>
     </tdml:infoset>
   </tdml:parserTestCase>
 
diff --git "a/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/data/test_01.$name__camel$" "b/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/test_01.$name__camel$"
similarity index 100%
rename from "src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/data/test_01.$name__camel$"
rename to "src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/test_01.$name__camel$"
diff --git "a/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/infosets/test_01.$name__camel$.xml" "b/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/test_01.$name__camel$.xml"
similarity index 100%
rename from "src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/infosets/test_01.$name__camel$.xml"
rename to "src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/test_01.$name__camel$.xml"
diff --git a/src/main/g8/.gitattributes b/src/main/g8/.gitattributes
index 0120b8e..959cd25 100644
--- a/src/main/g8/.gitattributes
+++ b/src/main/g8/.gitattributes
@@ -14,4 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 $endif$
-$if(namespaced.truthy)$src/test/resources/**/$else$test/$endif$data/** text=false
+$if(namespaced.truthy)$src/test/resources$else$test$endif$/** text=false
+$if(namespaced.truthy)$src/test/resources$else$test$endif$/**/*.tdml text=true
+$if(namespaced.truthy)$src/test/resources$else$test$endif$/**/*.xsd text=true
+$if(namespaced.truthy)$src/test/resources$else$test$endif$/**/*.xml text=true
+$if(namespaced.truthy)$src/test/scala$else$test$endif$/**/*.scala text=true