diff --git a/.travis.yml b/.travis.yml
index 358d7a3..4384fb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,11 +6,6 @@ os:
   - osx
   - windows
 
-addons:
-  apt:
-    packages:
-      - uuid-dev
-
 cache:
   - cargo
 
diff --git a/Cargo.toml b/Cargo.toml
index cf7e491..a8ab2f4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,4 +16,6 @@ aeron_driver-sys = { path = "./aeron_driver-sys" }
 memmap = "0.7"
 
 [dev-dependencies]
-tempfile = "3.1"
\ No newline at end of file
+clap = "2.33"
+ctrlc = "3.1.3"
+tempfile = "3.1"
diff --git a/aeron_driver-sys/Cargo.toml b/aeron_driver-sys/Cargo.toml
index df22f6b..8aac0d8 100644
--- a/aeron_driver-sys/Cargo.toml
+++ b/aeron_driver-sys/Cargo.toml
@@ -15,8 +15,3 @@ dunce = "1.0.0"
 
 [features]
 static = []
-
-[dev-dependencies]
-clap = "2.33"
-ctrlc = "3.1.3"
-tempfile = "3.1"
diff --git a/aeron_driver-sys/src/lib.rs b/aeron_driver-sys/src/lib.rs
index 9f6426e..386ea65 100644
--- a/aeron_driver-sys/src/lib.rs
+++ b/aeron_driver-sys/src/lib.rs
@@ -6,6 +6,8 @@ include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
 
 #[cfg(test)]
 mod tests {
+    use crate::*;
+    use std::convert::TryInto;
 
     #[test]
     fn version_check() {
diff --git a/aeron_driver-sys/examples/aeronmd.rs b/examples/aeronmd.rs
similarity index 100%
rename from aeron_driver-sys/examples/aeronmd.rs
rename to examples/aeronmd.rs
diff --git a/src/client/cnc_descriptor.rs b/src/client/cnc_descriptor.rs
index ae0d2ed..1c02318 100644
--- a/src/client/cnc_descriptor.rs
+++ b/src/client/cnc_descriptor.rs
@@ -60,7 +60,7 @@ pub struct MetaDataDefinition {
     _pid: i64,
 }
 
-/// Version code for the Aeron CnC file format that this client is compatible with
+/// Version code for the Aeron CnC file format
 pub const CNC_VERSION: i32 = crate::sematic_version_compose(0, 0, 16);
 
 /// Filename for the CnC file located in the Aeron directory