diff --git a/src/storage/file/id.rs b/src/storage/file/id.rs
index 3c8ddf36..8c5e121c 100644
--- a/src/storage/file/id.rs
+++ b/src/storage/file/id.rs
@@ -113,7 +113,8 @@ impl Into<String> for FileID {
 #[cfg(test)]
 mod test {
 
-    use super::{FileID, FileIDType};
+    use storage::file::id::FileID;
+    use storage::file::id_type::FileIDType;
 
     #[test]
     fn file_id_from_string() {
diff --git a/src/storage/file/mod.rs b/src/storage/file/mod.rs
index 16a072ef..61a7f749 100644
--- a/src/storage/file/mod.rs
+++ b/src/storage/file/mod.rs
@@ -100,10 +100,10 @@ impl Debug for File {
 mod test {
     // we use the JSON parser here, so we can generate FileHeaderData
     use storage::json::parser::JsonHeaderParser;
-    use super::match_header_spec;
+    use storage::file::header::match_header_spec;
     use storage::parser::{FileHeaderParser, ParserError};
-    use storage::file::FileHeaderData as FHD;
-    use storage::file::FileHeaderSpec as FHS;
+    use storage::file::header::data::FileHeaderData as FHD;
+    use storage::file::header::spec::FileHeaderSpec as FHS;
 
     #[test]
     fn test_spec_matching() {
diff --git a/src/storage/json/parser.rs b/src/storage/json/parser.rs
index 7011b6c2..8a76436b 100644
--- a/src/storage/json/parser.rs
+++ b/src/storage/json/parser.rs
@@ -150,8 +150,8 @@ mod test {
 
     use super::JsonHeaderParser;
     use storage::parser::{FileHeaderParser, ParserError};
-    use storage::file::FileHeaderData as FHD;
-    use storage::file::FileHeaderSpec as FHS;
+    use storage::file::header::data::FileHeaderData as FHD;
+    use storage::file::header::spec::FileHeaderSpec as FHS;
 
     #[test]
     fn test_deserialization() {