diff --git a/tests/samples/test1 b/sample-objects/basic.x86_64
similarity index 100%
rename from tests/samples/test1
rename to sample-objects/basic.x86_64
diff --git a/tests/samples/hello.c b/sample-objects/symver.c
similarity index 100%
rename from tests/samples/hello.c
rename to sample-objects/symver.c
diff --git a/sample-objects/symver.sh b/sample-objects/symver.sh
new file mode 100644
index 0000000..7b22846
--- /dev/null
+++ b/sample-objects/symver.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+gcc -o symver.x86_64.so symver.c -Wl,--as-needed -shared -fPIC -Xlinker --hash-style=both -Wl,--version-script=symver.ver
diff --git a/tests/samples/hello.ver b/sample-objects/symver.ver
similarity index 100%
rename from tests/samples/hello.ver
rename to sample-objects/symver.ver
diff --git a/tests/samples/hello.so b/sample-objects/symver.x86_64.so
similarity index 100%
rename from tests/samples/hello.so
rename to sample-objects/symver.x86_64.so
diff --git a/src/elf_bytes.rs b/src/elf_bytes.rs
index 0ce962d..5d2eddf 100644
--- a/src/elf_bytes.rs
+++ b/src/elf_bytes.rs
@@ -38,7 +38,7 @@ use crate::symbol::{Symbol, SymbolTable};
 /// use elf::ElfBytes;
 /// use elf::segment::ProgramHeader;
 ///
-/// let path = std::path::PathBuf::from("tests/samples/hello.so");
+/// let path = std::path::PathBuf::from("sample-objects/symver.x86_64.so");
 /// let file_data = std::fs::read(path).unwrap();
 ///
 /// let slice = file_data.as_slice();
@@ -201,7 +201,7 @@ impl<'data, E: EndianParse> ElfBytes<'data, E> {
     /// use elf::ElfBytes;
     /// use elf::section::SectionHeader;
     ///
-    /// let path = std::path::PathBuf::from("tests/samples/hello.so");
+    /// let path = std::path::PathBuf::from("sample-objects/symver.x86_64.so");
     /// let file_data = std::fs::read(path).unwrap();
     ///
     /// let slice = file_data.as_slice();
@@ -261,7 +261,7 @@ impl<'data, E: EndianParse> ElfBytes<'data, E> {
     /// use elf::note::Note;
     /// use elf::note::NoteGnuAbiTag;
     ///
-    /// let path = std::path::PathBuf::from("tests/samples/test1");
+    /// let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
     /// let file_data = std::fs::read(path).unwrap();
     /// let slice = file_data.as_slice();
     /// let file = ElfBytes::<AnyEndian>::minimal_parse(slice).unwrap();
@@ -793,7 +793,7 @@ mod interface_tests {
 
     #[test]
     fn simultaenous_segments_parsing() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let file_data = std::fs::read(path).expect("Could not read file.");
         let slice = file_data.as_slice();
         let file = ElfBytes::<AnyEndian>::minimal_parse(slice).expect("Open test1");
@@ -834,7 +834,7 @@ mod interface_tests {
 
     #[test]
     fn segments() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let file_data = std::fs::read(path).expect("Could not read file.");
         let slice = file_data.as_slice();
         let file = ElfBytes::<AnyEndian>::minimal_parse(slice).expect("Open test1");
@@ -861,7 +861,7 @@ mod interface_tests {
 
     #[test]
     fn section_headers() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let file_data = std::fs::read(path).expect("Could not read file.");
         let slice = file_data.as_slice();
         let file = ElfBytes::<AnyEndian>::minimal_parse(slice).expect("Open test1");
@@ -877,7 +877,7 @@ mod interface_tests {
 
     #[test]
     fn section_headers_with_strtab() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let file_data = std::fs::read(path).expect("Could not read file.");
         let slice = file_data.as_slice();
         let file = ElfBytes::<AnyEndian>::minimal_parse(slice).expect("Open test1");
@@ -906,7 +906,7 @@ mod interface_tests {
 
     #[test]
     fn section_header_by_name() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let file_data = std::fs::read(path).expect("Could not read file.");
         let slice = file_data.as_slice();
         let file = ElfBytes::<AnyEndian>::minimal_parse(slice).expect("Open test1");
@@ -927,7 +927,7 @@ mod interface_tests {
 
     #[test]
     fn find_common_sections() {
-        let path = std::path::PathBuf::from("tests/samples/hello.so");
+        let path = std::path::PathBuf::from("sample-objects/symver.x86_64.so");
         let file_data = std::fs::read(path).expect("Could not read file.");
         let slice = file_data.as_slice();
         let file = ElfBytes::<AnyEndian>::minimal_parse(slice).expect("Open test1");
@@ -945,7 +945,7 @@ mod interface_tests {
 
     #[test]
     fn section_data() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let file_data = std::fs::read(path).expect("Could not read file.");
         let slice = file_data.as_slice();
         let file = ElfBytes::<AnyEndian>::minimal_parse(slice).expect("Open test1");
@@ -969,7 +969,7 @@ mod interface_tests {
     // Test all the different section_data_as* with a section of the wrong type
     #[test]
     fn section_data_as_wrong_type() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let file_data = std::fs::read(path).expect("Could not read file.");
         let slice = file_data.as_slice();
         let file = ElfBytes::<AnyEndian>::minimal_parse(slice).expect("Open test1");
@@ -1019,7 +1019,7 @@ mod interface_tests {
 
     #[test]
     fn section_data_as_strtab() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let file_data = std::fs::read(path).expect("Could not read file.");
         let slice = file_data.as_slice();
         let file = ElfBytes::<AnyEndian>::minimal_parse(slice).expect("Open test1");
@@ -1042,7 +1042,7 @@ mod interface_tests {
 
     #[test]
     fn section_data_as_relas() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let file_data = std::fs::read(path).expect("Could not read file.");
         let slice = file_data.as_slice();
         let file = ElfBytes::<AnyEndian>::minimal_parse(slice).expect("Open test1");
@@ -1079,7 +1079,7 @@ mod interface_tests {
 
     #[test]
     fn section_data_as_notes() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let file_data = std::fs::read(path).expect("Could not read file.");
         let slice = file_data.as_slice();
         let file = ElfBytes::<AnyEndian>::minimal_parse(slice).expect("Open test1");
@@ -1107,7 +1107,7 @@ mod interface_tests {
 
     #[test]
     fn segment_data_as_notes() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let file_data = std::fs::read(path).expect("Could not read file.");
         let slice = file_data.as_slice();
         let file = ElfBytes::<AnyEndian>::minimal_parse(slice).expect("Open test1");
@@ -1142,7 +1142,7 @@ mod interface_tests {
 
     #[test]
     fn dynamic() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let file_data = std::fs::read(path).expect("Could not read file.");
         let slice = file_data.as_slice();
         let file = ElfBytes::<AnyEndian>::minimal_parse(slice).expect("Open test1");
@@ -1170,7 +1170,7 @@ mod interface_tests {
 
     #[test]
     fn symbol_table() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let file_data = std::fs::read(path).expect("Could not read file.");
         let slice = file_data.as_slice();
         let file = ElfBytes::<AnyEndian>::minimal_parse(slice).expect("Open test1");
@@ -1201,7 +1201,7 @@ mod interface_tests {
 
     #[test]
     fn dynamic_symbol_table() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let file_data = std::fs::read(path).expect("Could not read file.");
         let slice = file_data.as_slice();
         let file = ElfBytes::<AnyEndian>::minimal_parse(slice).expect("Open test1");
@@ -1232,7 +1232,7 @@ mod interface_tests {
 
     #[test]
     fn symbol_version_table() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let file_data = std::fs::read(path).expect("Could not read file.");
         let slice = file_data.as_slice();
         let file = ElfBytes::<AnyEndian>::minimal_parse(slice).expect("Open test1");
@@ -1264,7 +1264,7 @@ mod interface_tests {
 
     #[test]
     fn sysv_hash_table() {
-        let path = std::path::PathBuf::from("tests/samples/hello.so");
+        let path = std::path::PathBuf::from("sample-objects/symver.x86_64.so");
         let file_data = std::fs::read(path).expect("Could not read file.");
         let slice = file_data.as_slice();
         let file = ElfBytes::<AnyEndian>::minimal_parse(slice).expect("Open test1");
diff --git a/src/elf_stream.rs b/src/elf_stream.rs
index 7891f90..78cc4da 100644
--- a/src/elf_stream.rs
+++ b/src/elf_stream.rs
@@ -184,7 +184,7 @@ impl<E: EndianParse, S: std::io::Read + std::io::Seek> ElfStream<E, S> {
     /// use elf::note::Note;
     /// use elf::note::NoteGnuAbiTag;
     ///
-    /// let path = std::path::PathBuf::from("tests/samples/test1");
+    /// let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
     /// let io = std::fs::File::open(path).expect("Could not open file.");
     /// let mut file = ElfStream::<AnyEndian, _>::open_stream(io).expect("Open test1");
 
@@ -665,7 +665,7 @@ mod interface_tests {
 
     #[test]
     fn test_open_stream() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let io = std::fs::File::open(path).expect("Could not open file.");
         let file = ElfStream::<AnyEndian, _>::open_stream(io).expect("Open test1");
         assert_eq!(file.ehdr.e_type, abi::ET_EXEC);
@@ -673,7 +673,7 @@ mod interface_tests {
 
     #[test]
     fn section_headers_with_strtab() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let io = std::fs::File::open(path).expect("Could not open file.");
         let mut file = ElfStream::<AnyEndian, _>::open_stream(io).expect("Open test1");
 
@@ -692,7 +692,7 @@ mod interface_tests {
 
     #[test]
     fn section_header_by_name() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let io = std::fs::File::open(path).expect("Could not open file.");
         let mut file = ElfStream::<AnyEndian, _>::open_stream(io).expect("Open test1");
 
@@ -712,7 +712,7 @@ mod interface_tests {
 
     #[test]
     fn section_data_for_nobits() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let io = std::fs::File::open(path).expect("Could not open file.");
         let mut file = ElfStream::<AnyEndian, _>::open_stream(io).expect("Open test1");
 
@@ -727,7 +727,7 @@ mod interface_tests {
 
     #[test]
     fn section_data() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let io = std::fs::File::open(path).expect("Could not open file.");
         let mut file = ElfStream::<AnyEndian, _>::open_stream(io).expect("Open test1");
 
@@ -742,7 +742,7 @@ mod interface_tests {
 
     #[test]
     fn section_data_as_strtab() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let io = std::fs::File::open(path).expect("Could not open file.");
         let mut file = ElfStream::<AnyEndian, _>::open_stream(io).expect("Open test1");
 
@@ -758,7 +758,7 @@ mod interface_tests {
 
     #[test]
     fn segments() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let io = std::fs::File::open(path).expect("Could not open file.");
         let mut file = ElfStream::<AnyEndian, _>::open_stream(io).expect("Open test1");
 
@@ -785,7 +785,7 @@ mod interface_tests {
 
     #[test]
     fn symbol_table() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let io = std::fs::File::open(path).expect("Could not open file.");
         let mut file = ElfStream::<AnyEndian, _>::open_stream(io).expect("Open test1");
 
@@ -815,7 +815,7 @@ mod interface_tests {
 
     #[test]
     fn dynamic_symbol_table() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let io = std::fs::File::open(path).expect("Could not open file.");
         let mut file = ElfStream::<AnyEndian, _>::open_stream(io).expect("Open test1");
 
@@ -845,7 +845,7 @@ mod interface_tests {
 
     #[test]
     fn dynamic_section() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let io = std::fs::File::open(path).expect("Could not open file.");
         let mut file = ElfStream::<AnyEndian, _>::open_stream(io).expect("Open test1");
 
@@ -871,7 +871,7 @@ mod interface_tests {
 
     #[test]
     fn section_data_as_rels() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let io = std::fs::File::open(path).expect("Could not open file.");
         let mut file = ElfStream::<AnyEndian, _>::open_stream(io).expect("Open test1");
 
@@ -882,7 +882,7 @@ mod interface_tests {
 
     #[test]
     fn section_data_as_relas() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let io = std::fs::File::open(path).expect("Could not open file.");
         let mut file = ElfStream::<AnyEndian, _>::open_stream(io).expect("Open test1");
 
@@ -913,7 +913,7 @@ mod interface_tests {
 
     #[test]
     fn section_data_as_notes() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let io = std::fs::File::open(path).expect("Could not open file.");
         let mut file = ElfStream::<AnyEndian, _>::open_stream(io).expect("Open test1");
 
@@ -935,7 +935,7 @@ mod interface_tests {
 
     #[test]
     fn segment_data_as_notes() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let io = std::fs::File::open(path).expect("Could not open file.");
         let mut file = ElfStream::<AnyEndian, _>::open_stream(io).expect("Open test1");
 
@@ -969,7 +969,7 @@ mod interface_tests {
 
     #[test]
     fn symbol_version_table() {
-        let path = std::path::PathBuf::from("tests/samples/test1");
+        let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
         let io = std::fs::File::open(path).expect("Could not open file.");
         let mut file = ElfStream::<AnyEndian, _>::open_stream(io).expect("Open test1");
         let vst = file
@@ -999,7 +999,7 @@ mod interface_tests {
 
     #[test]
     fn sysv_hash_table() {
-        let path = std::path::PathBuf::from("tests/samples/hello.so");
+        let path = std::path::PathBuf::from("sample-objects/symver.x86_64.so");
         let io = std::fs::File::open(path).expect("Could not open file.");
         let mut file = ElfStream::<AnyEndian, _>::open_stream(io).expect("Open test1");
 
diff --git a/src/lib.rs b/src/lib.rs
index b80b11f..74cf9f6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -92,7 +92,7 @@
 //! use elf::note::NoteGnuBuildId;
 //! use elf::section::SectionHeader;
 //!
-//! let path = std::path::PathBuf::from("tests/samples/hello.so");
+//! let path = std::path::PathBuf::from("sample-objects/symver.x86_64.so");
 //! let file_data = std::fs::read(path).expect("Could not read file.");
 //! let slice = file_data.as_slice();
 //! let file = ElfBytes::<AnyEndian>::minimal_parse(slice).expect("Open test1");
diff --git a/src/note.rs b/src/note.rs
index c7e2ebf..bd1101a 100644
--- a/src/note.rs
+++ b/src/note.rs
@@ -7,7 +7,7 @@
 //! use elf::note::Note;
 //! use elf::note::NoteGnuAbiTag;
 //!
-//! let path = std::path::PathBuf::from("tests/samples/test1");
+//! let path = std::path::PathBuf::from("sample-objects/basic.x86_64");
 //! let file_data = std::fs::read(path).expect("Could not read file.");
 //! let slice = file_data.as_slice();
 //! let file = ElfBytes::<AnyEndian>::minimal_parse(slice).expect("Open test1");
diff --git a/tests/samples/hello.sh b/tests/samples/hello.sh
deleted file mode 100644
index 0d0250a..0000000
--- a/tests/samples/hello.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-gcc -o hello.so hello.c -Wl,--as-needed -shared -fPIC -Xlinker --hash-style=both -Wl,--version-script=hello.ver