fix tests not targeting right module paths

4 files changed, 7 insertions, 5 deletions

diff --git a/package.json b/package.json
index 348ca89..0bdbff2 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
         "hsmusic": "./src/upd8.js"
     },
     "scripts": {
-        "test": "tape test/**/*.js",
+        "test": "tape test/*.js test/**/*.js",
         "dev": "eslint src && node src/upd8.js"
     },
     "dependencies": {
diff --git a/test/cacheable-object.js b/test/cacheable-object.js
index 664a648..e55a8ea 100644
--- a/test/cacheable-object.js
+++ b/test/cacheable-object.js
@@ -1,6 +1,6 @@
 import test from 'tape';
 
-import CacheableObject from '../src/data/cacheable-object.js';
+import CacheableObject from '../src/data/things/cacheable-object.js';
 
 // Utility
 
diff --git a/test/data-validators.js b/test/data-validators.js
index f13f3f0..7a2b181 100644
--- a/test/data-validators.js
+++ b/test/data-validators.js
@@ -24,7 +24,7 @@ import {
 
   // Compositional utilities
   oneOf,
-} from '../src/data/validators.js';
+} from '../src/data/things/validators.js';
 
 function test(msg, fn) {
   _test(msg, t => {
diff --git a/test/things.js b/test/things.js
index 0d74b60..fe6e33e 100644
--- a/test/things.js
+++ b/test/things.js
@@ -1,11 +1,13 @@
 import test from 'tape';
 
-import {
+import thingConstructors from '../src/data/things/index.js';
+
+const {
   Album,
   Thing,
   Track,
   TrackGroup,
-} from '../src/data/things.js';
+} = thingConstructors;
 
 function stubAlbum(tracks) {
   const album = new Album();