diff --git a/src/uu/dd/src/dd.rs b/src/uu/dd/src/dd.rs
index c6c6a8f26..d00cbd1c0 100644
--- a/src/uu/dd/src/dd.rs
+++ b/src/uu/dd/src/dd.rs
@@ -11,7 +11,7 @@
 extern crate uucore;
 
 #[cfg(test)]
-mod dd_test;
+mod dd_unit_tests;
 
 mod parseargs;
 
diff --git a/src/uu/dd/src/dd_test.rs b/src/uu/dd/src/dd_test.rs
deleted file mode 100644
index 8f9de6d76..000000000
--- a/src/uu/dd/src/dd_test.rs
+++ /dev/null
@@ -1,600 +0,0 @@
-use super::*;
-
-use std::io::prelude::*;
-use std::io::BufReader;
-use std::fs;
-use md5::{ Md5, Digest, };
-use hex_literal::hex;
-
-// use tempfile::tempfile;
-// TODO: (Maybe) Use tempfiles in the tests.
-
-const DEFAULT_CFO: OConvFlags = OConvFlags {
-    sparse: false,
-    excl: false,
-    nocreat: false,
-    notrunc: false,
-    fdatasync: false,
-    fsync: false,
-};
-
-const DEFAULT_IFLAGS: IFlags = IFlags {
-    cio: false,
-    direct: false,
-    directory: false,
-    dsync: false,
-    sync: false,
-    nocache: false,
-    nonblock: false,
-    noatime: false,
-    noctty: false,
-    nofollow: false,
-    nolinks: false,
-    binary: false,
-    text: false,
-    fullblock: false,
-    count_bytes: false,
-    skip_bytes: false,
-};
-
-const DEFAULT_OFLAGS: OFlags = OFlags {
-    append: false,
-    cio: false,
-    direct: false,
-    directory: false,
-    dsync: false,
-    sync: false,
-    nocache: false,
-    nonblock: false,
-    noatime: false,
-    noctty: false,
-    nofollow: false,
-    nolinks: false,
-    binary: false,
-    text: false,
-    seek_bytes: false,
-};
-
-#[macro_export]
-macro_rules! icf (
-    () =>
-    {
-        icf!(None)
-    };
-    ( $ctable:expr ) =>
-    {
-        IConvFlags {
-            ctable: $ctable,
-            block: None,
-            unblock: None,
-            swab: false,
-            sync: false,
-            noerror: false,
-        }
-    };
-);
-
-macro_rules! make_spec_test (
-    ( $test_id:ident, $test_name:expr, $src:expr ) =>
-    {
-        // When spec not given, output should match input
-        make_spec_test!($test_id, $test_name, $src, $src);
-    };
-    ( $test_id:ident, $test_name:expr, $src:expr, $spec:expr ) =>
-    {
-        make_spec_test!($test_id,
-                        $test_name,
-                        Input {
-                            src: $src,
-                            non_ascii: false,
-                            ibs: 512,
-                            xfer_stats: StatusLevel::None,
-                            cflags: icf!(),
-                            iflags: DEFAULT_IFLAGS,
-                        },
-                        Output {
-                            dst: File::create(format!("./test-resources/FAILED-{}.test", $test_name)).unwrap(),
-                            obs: 512,
-                            cflags: DEFAULT_CFO,
-                            oflags: DEFAULT_OFLAGS,
-                        },
-                        $spec,
-                        format!("./test-resources/FAILED-{}.test", $test_name)
-        );
-    };
-    ( $test_id:ident, $test_name:expr, $i:expr, $o:expr, $spec:expr, $tmp_fname:expr ) =>
-    {
-        #[test]
-        fn $test_id()
-        {
-            dd_fileout($i,$o).unwrap();
-
-            let res = File::open($tmp_fname).unwrap();
-            let res = BufReader::new(res);
-
-            let spec = BufReader::new($spec);
-
-            for (b_res, b_spec) in res.bytes().zip(spec.bytes())
-            {
-                assert_eq!(b_res.unwrap(),
-                           b_spec.unwrap());
-            }
-
-            fs::remove_file($tmp_fname).unwrap();
-        }
-    };
-);
-
-macro_rules! make_conv_test (
-    ( $test_id:ident, $test_name:expr, $src:expr, $ctable:expr, $spec:expr ) =>
-    {
-        make_spec_test!($test_id,
-                        $test_name,
-                        Input {
-                            src: $src,
-                            non_ascii: false,
-                            ibs: 512,
-                            xfer_stats: StatusLevel::None,
-                            cflags: icf!($ctable),
-                            iflags: DEFAULT_IFLAGS,
-                        },
-                        Output {
-                            dst: File::create(format!("./test-resources/FAILED-{}.test", $test_name)).unwrap(),
-                            obs: 512,
-                            cflags: DEFAULT_CFO,
-                            oflags: DEFAULT_OFLAGS,
-                        },
-                        $spec,
-                        format!("./test-resources/FAILED-{}.test", $test_name)
-        );
-    };
-);
-
-macro_rules! make_icf_test (
-    ( $test_id:ident, $test_name:expr, $src:expr, $icf:expr, $spec:expr ) =>
-    {
-        make_spec_test!($test_id,
-                        $test_name,
-                        Input {
-                            src: $src,
-                            non_ascii: false,
-                            ibs: 512,
-                            xfer_stats: StatusLevel::None,
-                            cflags: $icf,
-                            iflags: DEFAULT_IFLAGS,
-                        },
-                        Output {
-                            dst: File::create(format!("./test-resources/FAILED-{}.test", $test_name)).unwrap(),
-                            obs: 512,
-                            cflags: DEFAULT_CFO,
-                            oflags: DEFAULT_OFLAGS,
-                        },
-                        $spec,
-                        format!("./test-resources/FAILED-{}.test", $test_name)
-        );
-    };
-);
-
-macro_rules! make_block_test (
-    ( $test_id:ident, $test_name:expr, $src:expr, $block:expr, $spec:expr ) =>
-    {
-        make_spec_test!($test_id,
-                        $test_name,
-                        Input {
-                            src: $src,
-                            non_ascii: false,
-                            ibs: 512,
-                            xfer_stats: StatusLevel::None,
-                            cflags: IConvFlags {
-                                ctable: None,
-                                block: $block,
-                                unblock: None,
-                                swab: false,
-                                sync: false,
-                                noerror: false,
-                            },
-                            iflags: DEFAULT_IFLAGS,
-                        },
-                        Output {
-                            dst: File::create(format!("./test-resources/FAILED-{}.test", $test_name)).unwrap(),
-                            obs: 512,
-                            cflags: DEFAULT_CFO,
-                            oflags: DEFAULT_OFLAGS,
-                        },
-                        $spec,
-                        format!("./test-resources/FAILED-{}.test", $test_name)
-        );
-    };
-);
-
-make_spec_test!(
-    zeros_4k_test,
-    "zeros-4k",
-    File::open("./test-resources/zeros-620f0b67a91f7f74151bc5be745b7110.test").unwrap()
-);
-
-make_spec_test!(
-    ones_4k_test,
-    "ones-4k",
-    File::open("./test-resources/ones-6ae59e64850377ee5470c854761551ea.test").unwrap()
-);
-
-make_spec_test!(
-    deadbeef_32k_test,
-    "deadbeef-32k",
-    File::open("./test-resources/deadbeef-18d99661a1de1fc9af21b0ec2cd67ba3.test").unwrap()
-);
-
-make_spec_test!(
-    random_73k_test,
-    "random-73k",
-    File::open("./test-resources/random-5828891cb1230748e146f34223bbd3b5.test").unwrap()
-);
-
-make_conv_test!(
-    atoe_conv_spec_test,
-    "atoe-conv-spec-test",
-    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
-    Some(&ASCII_TO_EBCDIC),
-    File::open("./test-resources/gnudd-conv-atoe-seq-byte-values.spec").unwrap()
-);
-
-make_conv_test!(
-    etoa_conv_spec_test,
-    "etoa-conv-spec-test",
-    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
-    Some(&EBCDIC_TO_ASCII),
-    File::open("./test-resources/gnudd-conv-etoa-seq-byte-values.spec").unwrap()
-);
-
-make_conv_test!(
-    atoibm_conv_spec_test,
-    "atoibm-conv-spec-test",
-    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
-    Some(&ASCII_TO_IBM),
-    File::open("./test-resources/gnudd-conv-atoibm-seq-byte-values.spec").unwrap()
-);
-
-make_conv_test!(
-    lcase_ascii_to_ucase_ascii,
-    "lcase_ascii_to_ucase_ascii",
-    File::open("./test-resources/lcase-ascii.test").unwrap(),
-    Some(&ASCII_LCASE_TO_UCASE),
-    File::open("./test-resources/ucase-ascii.test").unwrap()
-);
-
-make_conv_test!(
-    ucase_ascii_to_lcase_ascii,
-    "ucase_ascii_to_lcase_ascii",
-    File::open("./test-resources/ucase-ascii.test").unwrap(),
-    Some(&ASCII_UCASE_TO_LCASE),
-    File::open("./test-resources/lcase-ascii.test").unwrap()
-);
-
-make_conv_test!(
-    // conv=ebcdic,ucase
-    atoe_and_ucase_conv_spec_test,
-    "atoe-and-ucase-conv-spec-test",
-    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
-    Some(&ASCII_TO_EBCDIC_LCASE_TO_UCASE),
-    File::open("./test-resources/ucase-ebcdic.test").unwrap()
-);
-
-make_conv_test!(
-    // conv=ebcdic,lcase
-    atoe_and_lcase_conv_spec_test,
-    "atoe-and-lcase-conv-spec-test",
-    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
-    Some(&ASCII_TO_EBCDIC_UCASE_TO_LCASE),
-    File::open("./test-resources/lcase-ebcdic.test").unwrap()
-);
-
-make_conv_test!(
-    // conv=ibm,ucase
-    atoibm_and_ucase_conv_spec_test,
-    "atoibm-and-ucase-conv-spec-test",
-    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
-    Some(&ASCII_TO_IBM_UCASE_TO_LCASE),
-    File::open("./test-resources/lcase-ibm.test").unwrap()
-);
-
-make_conv_test!(
-    // conv=ibm,lcase
-    atoibm_and_lcase_conv_spec_test,
-    "atoibm-and-lcase-conv-spec-test",
-    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
-    Some(&ASCII_TO_IBM_LCASE_TO_UCASE),
-    File::open("./test-resources/ucase-ibm.test").unwrap()
-);
-
-#[test]
-fn all_valid_ascii_ebcdic_ascii_roundtrip_conv_test()
-{
-    // ASCII->EBCDIC
-    let test_name = "all-valid-ascii-to-ebcdic";
-    let tmp_fname_ae = format!("./test-resources/FAILED-{}.test", test_name);
-
-    let i = Input {
-        src: File::open("./test-resources/all-valid-ascii-chars-37eff01866ba3f538421b30b7cbefcac.test").unwrap(),
-        non_ascii: false,
-        ibs: 128,
-        xfer_stats: StatusLevel::None,
-        cflags: icf!(Some(&ASCII_TO_EBCDIC)),
-        iflags: DEFAULT_IFLAGS,
-    };
-
-    let o = Output {
-        dst: File::create(&tmp_fname_ae).unwrap(),
-        obs: 1024,
-        cflags: DEFAULT_CFO,
-        oflags: DEFAULT_OFLAGS,
-    };
-
-    dd_fileout(i,o).unwrap();
-
-    // EBCDIC->ASCII
-    let test_name = "all-valid-ebcdic-to-ascii";
-    let tmp_fname_ea = format!("./test-resources/FAILED-{}.test", test_name);
-
-    let i = Input {
-        src: File::open(&tmp_fname_ae).unwrap(),
-        non_ascii: false,
-        ibs: 256,
-        xfer_stats: StatusLevel::None,
-        cflags: icf!(Some(&EBCDIC_TO_ASCII)),
-        iflags: DEFAULT_IFLAGS,
-    };
-
-    let o = Output {
-        dst: File::create(&tmp_fname_ea).unwrap(),
-        obs: 1024,
-        cflags: DEFAULT_CFO,
-        oflags: DEFAULT_OFLAGS,
-    };
-
-    dd_fileout(i,o).unwrap();
-
-    let res = {
-        let res = File::open(&tmp_fname_ea).unwrap();
-        let res = BufReader::new(res);
-
-        let mut h = Md5::new();
-        for b in res.bytes()
-        {
-            h.update([b.unwrap()]);
-        }
-
-        h.finalize()
-    };
-
-    assert_eq!(hex!("37eff01866ba3f538421b30b7cbefcac"), res[..]);
-
-    fs::remove_file(&tmp_fname_ae).unwrap();
-    fs::remove_file(&tmp_fname_ea).unwrap();
-}
-
-make_icf_test!(
-    swab_256_test,
-    "swab-256",
-    File::open("./test-resources/seq-byte-values.test").unwrap(),
-    IConvFlags {
-        ctable: None,
-        block: None,
-        unblock: None,
-        swab: true,
-        sync: false,
-        noerror: false,
-    },
-    File::open("./test-resources/seq-byte-values-swapped.test").unwrap()
-);
-
-make_icf_test!(
-    swab_257_test,
-    "swab-257",
-    File::open("./test-resources/seq-byte-values-odd.test").unwrap(),
-    IConvFlags {
-        ctable: None,
-        block: None,
-        unblock: None,
-        swab: true,
-        sync: false,
-        noerror: false,
-    },
-    File::open("./test-resources/seq-byte-values-odd.spec").unwrap()
-);
-
-static NL: u8 = '\n' as u8;
-static SPACE: u8 = ' ' as u8;
-
-#[test]
-fn block_test_no_nl()
-{
-    let mut buf = vec![0u8, 1u8, 2u8, 3u8];
-    let res = block(buf, 4);
-
-    assert_eq!(res, vec![
-        vec![0u8, 1u8, 2u8, 3u8],
-    ]);
-}
-
-#[test]
-fn block_test_no_nl_short_rec()
-{
-    let mut buf = vec![0u8, 1u8, 2u8, 3u8];
-    let res = block(buf, 8);
-
-    assert_eq!(res, vec![
-        vec![0u8, 1u8, 2u8, 3u8, SPACE, SPACE, SPACE, SPACE],
-    ]);
-}
-
-#[test]
-fn block_test_no_nl_trunc()
-{
-    let mut buf = vec![0u8, 1u8, 2u8, 3u8, 4u8];
-    let res = block(buf, 4);
-
-    assert_eq!(res, vec![
-        vec![0u8, 1u8, 2u8, 3u8/*, 4u8*/],
-    ]);
-}
-
-#[test]
-fn block_test_nl_gt_cbs_trunc()
-{
-    let mut buf = vec![0u8, 1u8, 2u8, 3u8, 4u8, NL, 0u8, 1u8, 2u8, 3u8, 4u8, NL, 5u8, 6u8, 7u8, 8u8];
-    let res = block(buf, 4);
-
-    assert_eq!(res, vec![
-        vec![0u8, 1u8, 2u8, 3u8],
-        // gnu-dd truncates this record
-        // vec![4u8, SPACE, SPACE, SPACE],
-        vec![0u8, 1u8, 2u8, 3u8],
-        vec![5u8, 6u8, 7u8, 8u8],
-    ]);
-}
-
-#[test]
-fn block_test_surrounded_nl()
-{
-    let mut buf = vec![0u8, 1u8, 2u8, 3u8, NL, 4u8, 5u8, 6u8, 7u8, 8u8];
-    let res = block(buf, 8);
-
-    assert_eq!(res, vec![
-        vec![0u8, 1u8, 2u8, 3u8, SPACE, SPACE, SPACE, SPACE],
-        vec![4u8, 5u8, 6u8, 7u8, 8u8, SPACE, SPACE, SPACE],
-    ]);
-}
-
-#[test]
-fn block_test_multiple_nl_same_block()
-{
-    let mut buf = vec![0u8, 1u8, 2u8, 3u8, NL, 4u8, NL, 5u8, 6u8, 7u8, 8u8, 9u8];
-    let res = block(buf, 8);
-
-    assert_eq!(res, vec![
-        vec![0u8, 1u8, 2u8, 3u8, SPACE, SPACE, SPACE, SPACE],
-        vec![4u8, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE],
-        vec![5u8, 6u8, 7u8, 8u8, 9u8, SPACE, SPACE, SPACE],
-    ]);
-}
-
-#[test]
-fn block_test_multiple_nl_diff_block()
-{
-    let mut buf = vec![0u8, 1u8, 2u8, 3u8, NL, 4u8, 5u8, 6u8, 7u8, NL, 8u8, 9u8];
-    let res = block(buf, 8);
-
-    assert_eq!(res, vec![
-        vec![0u8, 1u8, 2u8, 3u8, SPACE, SPACE, SPACE, SPACE],
-        vec![4u8, 5u8, 6u8, 7u8, SPACE, SPACE, SPACE, SPACE],
-        vec![8u8, 9u8, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE],
-    ]);
-}
-
-#[test]
-fn block_test_lone_nl_end()
-{
-    let mut buf = vec![0u8, 1u8, 2u8, 3u8, NL];
-    let res = block(buf, 4);
-
-    assert_eq!(res, vec![
-        vec![0u8, 1u8, 2u8, 3u8],
-    ]);
-}
-
-#[test]
-fn block_test_end_nl()
-{
-    let mut buf = vec![0u8, 1u8, 2u8, NL];
-    let res = block(buf, 4);
-
-    assert_eq!(res, vec![
-        vec![0u8, 1u8, 2u8, SPACE]
-    ]);
-}
-
-#[test]
-fn block_test_end_nl_new_block()
-{
-    let mut buf = vec![0u8, 1u8, 2u8, 3u8, NL];
-    let res = block(buf, 4);
-
-    assert_eq!(res, vec![
-        vec![0u8, 1u8, 2u8, 3u8],
-    ]);
-}
-
-#[test]
-fn block_test_double_end_nl()
-{
-    let mut buf = vec![0u8, 1u8, 2u8, NL, NL];
-    let res = block(buf, 4);
-
-    assert_eq!(res, vec![
-        vec![0u8, 1u8, 2u8, SPACE],
-        vec![SPACE, SPACE, SPACE, SPACE],
-    ]);
-}
-
-#[test]
-fn block_test_start_nl()
-{
-    let mut buf = vec![NL, 0u8, 1u8, 2u8, 3u8];
-    let res = block(buf, 4);
-
-    assert_eq!(res, vec![
-        vec![SPACE, SPACE, SPACE, SPACE],
-        vec![0u8, 1u8, 2u8, 3u8],
-    ]);
-}
-
-#[test]
-fn block_test_double_nl()
-{
-    let mut buf = vec![0u8, 1u8, 2u8, 3u8, NL, NL, 4u8, 5u8, 6u8, 7u8];
-    let res = block(buf, 8);
-
-    assert_eq!(res, vec![
-        vec![0u8, 1u8, 2u8, 3u8, SPACE, SPACE, SPACE, SPACE],
-        vec![SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE],
-        vec![4u8, 5u8, 6u8, 7u8, SPACE, SPACE, SPACE, SPACE],
-    ]);
-}
-
-#[test]
-fn block_test_double_nl_double_trunc()
-{
-    let mut buf = vec![0u8, 1u8, 2u8, 3u8, NL, NL, 4u8, 5u8, 6u8, 7u8, 8u8];
-    let res = block(buf, 4);
-
-    assert_eq!(res, vec![
-        vec![0u8, 1u8, 2u8, 3u8],
-        vec![SPACE, SPACE, SPACE, SPACE],
-        vec![4u8, 5u8, 6u8, 7u8/*, 8u8*/],
-    ]);
-}
-
-make_block_test!(
-    block_cbs16,
-    "block-cbs-16",
-    File::open("./test-resources/dd-block-cbs16.test").unwrap(),
-    Some(16),
-    File::open("./test-resources/dd-block-cbs16.spec").unwrap()
-);
-
-make_block_test!(
-    block_cbs16_as_cbs8,
-    "block-cbs-16-as-cbs8",
-    File::open("./test-resources/dd-block-cbs16.test").unwrap(),
-    Some(8),
-    File::open("./test-resources/dd-block-cbs8.spec").unwrap()
-);
-
-make_block_test!(
-    block_consecutive_nl,
-    "block-consecutive-nl",
-    File::open("./test-resources/dd-block-consecutive-nl.test").unwrap(),
-    Some(16),
-    File::open("./test-resources/dd-block-consecutive-nl-cbs16.spec").unwrap()
-);
diff --git a/src/uu/dd/src/dd_unit_tests/block_unblock_tests.rs b/src/uu/dd/src/dd_unit_tests/block_unblock_tests.rs
new file mode 100644
index 000000000..7dffe8392
--- /dev/null
+++ b/src/uu/dd/src/dd_unit_tests/block_unblock_tests.rs
@@ -0,0 +1,197 @@
+use super::*;
+
+static NL: u8 = '\n' as u8;
+static SPACE: u8 = ' ' as u8;
+
+#[test]
+fn block_test_no_nl()
+{
+    let buf = vec![0u8, 1u8, 2u8, 3u8];
+    let res = block(buf, 4);
+
+    assert_eq!(res, vec![
+        vec![0u8, 1u8, 2u8, 3u8],
+    ]);
+}
+
+#[test]
+fn block_test_no_nl_short_rec()
+{
+    let buf = vec![0u8, 1u8, 2u8, 3u8];
+    let res = block(buf, 8);
+
+    assert_eq!(res, vec![
+        vec![0u8, 1u8, 2u8, 3u8, SPACE, SPACE, SPACE, SPACE],
+    ]);
+}
+
+#[test]
+fn block_test_no_nl_trunc()
+{
+    let buf = vec![0u8, 1u8, 2u8, 3u8, 4u8];
+    let res = block(buf, 4);
+
+    assert_eq!(res, vec![
+        vec![0u8, 1u8, 2u8, 3u8/*, 4u8*/],
+    ]);
+}
+
+#[test]
+fn block_test_nl_gt_cbs_trunc()
+{
+    let buf = vec![0u8, 1u8, 2u8, 3u8, 4u8, NL, 0u8, 1u8, 2u8, 3u8, 4u8, NL, 5u8, 6u8, 7u8, 8u8];
+    let res = block(buf, 4);
+
+    assert_eq!(res, vec![
+        vec![0u8, 1u8, 2u8, 3u8],
+        // gnu-dd truncates this record
+        // vec![4u8, SPACE, SPACE, SPACE],
+        vec![0u8, 1u8, 2u8, 3u8],
+        vec![5u8, 6u8, 7u8, 8u8],
+    ]);
+}
+
+#[test]
+fn block_test_surrounded_nl()
+{
+    let buf = vec![0u8, 1u8, 2u8, 3u8, NL, 4u8, 5u8, 6u8, 7u8, 8u8];
+    let res = block(buf, 8);
+
+    assert_eq!(res, vec![
+        vec![0u8, 1u8, 2u8, 3u8, SPACE, SPACE, SPACE, SPACE],
+        vec![4u8, 5u8, 6u8, 7u8, 8u8, SPACE, SPACE, SPACE],
+    ]);
+}
+
+#[test]
+fn block_test_multiple_nl_same_block()
+{
+    let buf = vec![0u8, 1u8, 2u8, 3u8, NL, 4u8, NL, 5u8, 6u8, 7u8, 8u8, 9u8];
+    let res = block(buf, 8);
+
+    assert_eq!(res, vec![
+        vec![0u8, 1u8, 2u8, 3u8, SPACE, SPACE, SPACE, SPACE],
+        vec![4u8, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE],
+        vec![5u8, 6u8, 7u8, 8u8, 9u8, SPACE, SPACE, SPACE],
+    ]);
+}
+
+#[test]
+fn block_test_multiple_nl_diff_block()
+{
+    let buf = vec![0u8, 1u8, 2u8, 3u8, NL, 4u8, 5u8, 6u8, 7u8, NL, 8u8, 9u8];
+    let res = block(buf, 8);
+
+    assert_eq!(res, vec![
+        vec![0u8, 1u8, 2u8, 3u8, SPACE, SPACE, SPACE, SPACE],
+        vec![4u8, 5u8, 6u8, 7u8, SPACE, SPACE, SPACE, SPACE],
+        vec![8u8, 9u8, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE],
+    ]);
+}
+
+#[test]
+fn block_test_lone_nl_end()
+{
+    let buf = vec![0u8, 1u8, 2u8, 3u8, NL];
+    let res = block(buf, 4);
+
+    assert_eq!(res, vec![
+        vec![0u8, 1u8, 2u8, 3u8],
+    ]);
+}
+
+#[test]
+fn block_test_end_nl()
+{
+    let buf = vec![0u8, 1u8, 2u8, NL];
+    let res = block(buf, 4);
+
+    assert_eq!(res, vec![
+        vec![0u8, 1u8, 2u8, SPACE]
+    ]);
+}
+
+#[test]
+fn block_test_end_nl_new_block()
+{
+    let buf = vec![0u8, 1u8, 2u8, 3u8, NL];
+    let res = block(buf, 4);
+
+    assert_eq!(res, vec![
+        vec![0u8, 1u8, 2u8, 3u8],
+    ]);
+}
+
+#[test]
+fn block_test_double_end_nl()
+{
+    let buf = vec![0u8, 1u8, 2u8, NL, NL];
+    let res = block(buf, 4);
+
+    assert_eq!(res, vec![
+        vec![0u8, 1u8, 2u8, SPACE],
+        vec![SPACE, SPACE, SPACE, SPACE],
+    ]);
+}
+
+#[test]
+fn block_test_start_nl()
+{
+    let buf = vec![NL, 0u8, 1u8, 2u8, 3u8];
+    let res = block(buf, 4);
+
+    assert_eq!(res, vec![
+        vec![SPACE, SPACE, SPACE, SPACE],
+        vec![0u8, 1u8, 2u8, 3u8],
+    ]);
+}
+
+#[test]
+fn block_test_double_nl()
+{
+    let buf = vec![0u8, 1u8, 2u8, 3u8, NL, NL, 4u8, 5u8, 6u8, 7u8];
+    let res = block(buf, 8);
+
+    assert_eq!(res, vec![
+        vec![0u8, 1u8, 2u8, 3u8, SPACE, SPACE, SPACE, SPACE],
+        vec![SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE],
+        vec![4u8, 5u8, 6u8, 7u8, SPACE, SPACE, SPACE, SPACE],
+    ]);
+}
+
+#[test]
+fn block_test_double_nl_double_trunc()
+{
+    let buf = vec![0u8, 1u8, 2u8, 3u8, NL, NL, 4u8, 5u8, 6u8, 7u8, 8u8];
+    let res = block(buf, 4);
+
+    assert_eq!(res, vec![
+        vec![0u8, 1u8, 2u8, 3u8],
+        vec![SPACE, SPACE, SPACE, SPACE],
+        vec![4u8, 5u8, 6u8, 7u8/*, 8u8*/],
+    ]);
+}
+
+make_block_test!(
+    block_cbs16,
+    "block-cbs-16",
+    File::open("./test-resources/dd-block-cbs16.test").unwrap(),
+    Some(16),
+    File::open("./test-resources/dd-block-cbs16.spec").unwrap()
+);
+
+make_block_test!(
+    block_cbs16_as_cbs8,
+    "block-cbs-16-as-cbs8",
+    File::open("./test-resources/dd-block-cbs16.test").unwrap(),
+    Some(8),
+    File::open("./test-resources/dd-block-cbs8.spec").unwrap()
+);
+
+make_block_test!(
+    block_consecutive_nl,
+    "block-consecutive-nl",
+    File::open("./test-resources/dd-block-consecutive-nl.test").unwrap(),
+    Some(16),
+    File::open("./test-resources/dd-block-consecutive-nl-cbs16.spec").unwrap()
+);
diff --git a/src/uu/dd/src/dd_unit_tests/conversion_tests.rs b/src/uu/dd/src/dd_unit_tests/conversion_tests.rs
new file mode 100644
index 000000000..584b92df1
--- /dev/null
+++ b/src/uu/dd/src/dd_unit_tests/conversion_tests.rs
@@ -0,0 +1,173 @@
+use super::*;
+
+make_conv_test!(
+    atoe_conv_spec_test,
+    "atoe-conv-spec-test",
+    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
+    Some(&ASCII_TO_EBCDIC),
+    File::open("./test-resources/gnudd-conv-atoe-seq-byte-values.spec").unwrap()
+);
+
+make_conv_test!(
+    etoa_conv_spec_test,
+    "etoa-conv-spec-test",
+    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
+    Some(&EBCDIC_TO_ASCII),
+    File::open("./test-resources/gnudd-conv-etoa-seq-byte-values.spec").unwrap()
+);
+
+make_conv_test!(
+    atoibm_conv_spec_test,
+    "atoibm-conv-spec-test",
+    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
+    Some(&ASCII_TO_IBM),
+    File::open("./test-resources/gnudd-conv-atoibm-seq-byte-values.spec").unwrap()
+);
+
+make_conv_test!(
+    lcase_ascii_to_ucase_ascii,
+    "lcase_ascii_to_ucase_ascii",
+    File::open("./test-resources/lcase-ascii.test").unwrap(),
+    Some(&ASCII_LCASE_TO_UCASE),
+    File::open("./test-resources/ucase-ascii.test").unwrap()
+);
+
+make_conv_test!(
+    ucase_ascii_to_lcase_ascii,
+    "ucase_ascii_to_lcase_ascii",
+    File::open("./test-resources/ucase-ascii.test").unwrap(),
+    Some(&ASCII_UCASE_TO_LCASE),
+    File::open("./test-resources/lcase-ascii.test").unwrap()
+);
+
+make_conv_test!(
+    // conv=ebcdic,ucase
+    atoe_and_ucase_conv_spec_test,
+    "atoe-and-ucase-conv-spec-test",
+    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
+    Some(&ASCII_TO_EBCDIC_LCASE_TO_UCASE),
+    File::open("./test-resources/ucase-ebcdic.test").unwrap()
+);
+
+make_conv_test!(
+    // conv=ebcdic,lcase
+    atoe_and_lcase_conv_spec_test,
+    "atoe-and-lcase-conv-spec-test",
+    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
+    Some(&ASCII_TO_EBCDIC_UCASE_TO_LCASE),
+    File::open("./test-resources/lcase-ebcdic.test").unwrap()
+);
+
+make_conv_test!(
+    // conv=ibm,ucase
+    atoibm_and_ucase_conv_spec_test,
+    "atoibm-and-ucase-conv-spec-test",
+    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
+    Some(&ASCII_TO_IBM_UCASE_TO_LCASE),
+    File::open("./test-resources/lcase-ibm.test").unwrap()
+);
+
+make_conv_test!(
+    // conv=ibm,lcase
+    atoibm_and_lcase_conv_spec_test,
+    "atoibm-and-lcase-conv-spec-test",
+    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
+    Some(&ASCII_TO_IBM_LCASE_TO_UCASE),
+    File::open("./test-resources/ucase-ibm.test").unwrap()
+);
+
+#[test]
+fn all_valid_ascii_ebcdic_ascii_roundtrip_conv_test()
+{
+    // ASCII->EBCDIC
+    let test_name = "all-valid-ascii-to-ebcdic";
+    let tmp_fname_ae = format!("./test-resources/FAILED-{}.test", test_name);
+
+    let i = Input {
+        src: File::open("./test-resources/all-valid-ascii-chars-37eff01866ba3f538421b30b7cbefcac.test").unwrap(),
+        non_ascii: false,
+        ibs: 128,
+        xfer_stats: StatusLevel::None,
+        cflags: icf!(Some(&ASCII_TO_EBCDIC)),
+        iflags: DEFAULT_IFLAGS,
+    };
+
+    let o = Output {
+        dst: File::create(&tmp_fname_ae).unwrap(),
+        obs: 1024,
+        cflags: DEFAULT_CFO,
+        oflags: DEFAULT_OFLAGS,
+    };
+
+    dd_fileout(i,o).unwrap();
+
+    // EBCDIC->ASCII
+    let test_name = "all-valid-ebcdic-to-ascii";
+    let tmp_fname_ea = format!("./test-resources/FAILED-{}.test", test_name);
+
+    let i = Input {
+        src: File::open(&tmp_fname_ae).unwrap(),
+        non_ascii: false,
+        ibs: 256,
+        xfer_stats: StatusLevel::None,
+        cflags: icf!(Some(&EBCDIC_TO_ASCII)),
+        iflags: DEFAULT_IFLAGS,
+    };
+
+    let o = Output {
+        dst: File::create(&tmp_fname_ea).unwrap(),
+        obs: 1024,
+        cflags: DEFAULT_CFO,
+        oflags: DEFAULT_OFLAGS,
+    };
+
+    dd_fileout(i,o).unwrap();
+
+    let res = {
+        let res = File::open(&tmp_fname_ea).unwrap();
+        let res = BufReader::new(res);
+
+        let mut h = Md5::new();
+        for b in res.bytes()
+        {
+            h.update([b.unwrap()]);
+        }
+
+        h.finalize()
+    };
+
+    assert_eq!(hex!("37eff01866ba3f538421b30b7cbefcac"), res[..]);
+
+    fs::remove_file(&tmp_fname_ae).unwrap();
+    fs::remove_file(&tmp_fname_ea).unwrap();
+}
+
+make_icf_test!(
+    swab_256_test,
+    "swab-256",
+    File::open("./test-resources/seq-byte-values.test").unwrap(),
+    IConvFlags {
+        ctable: None,
+        block: None,
+        unblock: None,
+        swab: true,
+        sync: false,
+        noerror: false,
+    },
+    File::open("./test-resources/seq-byte-values-swapped.test").unwrap()
+);
+
+make_icf_test!(
+    swab_257_test,
+    "swab-257",
+    File::open("./test-resources/seq-byte-values-odd.test").unwrap(),
+    IConvFlags {
+        ctable: None,
+        block: None,
+        unblock: None,
+        swab: true,
+        sync: false,
+        noerror: false,
+    },
+    File::open("./test-resources/seq-byte-values-odd.spec").unwrap()
+);
diff --git a/src/uu/dd/src/dd_unit_tests/mod.rs b/src/uu/dd/src/dd_unit_tests/mod.rs
new file mode 100644
index 000000000..5fd1fef19
--- /dev/null
+++ b/src/uu/dd/src/dd_unit_tests/mod.rs
@@ -0,0 +1,216 @@
+use super::*;
+
+mod sanity_tests;
+mod conversion_tests;
+mod block_unblock_tests;
+
+use std::io::prelude::*;
+use std::io::BufReader;
+use std::fs;
+use md5::{ Md5, Digest, };
+use hex_literal::hex;
+
+// use tempfile::tempfile;
+// TODO: (Maybe) Use tempfiles in the tests.
+
+const DEFAULT_CFO: OConvFlags = OConvFlags {
+    sparse: false,
+    excl: false,
+    nocreat: false,
+    notrunc: false,
+    fdatasync: false,
+    fsync: false,
+};
+
+const DEFAULT_IFLAGS: IFlags = IFlags {
+    cio: false,
+    direct: false,
+    directory: false,
+    dsync: false,
+    sync: false,
+    nocache: false,
+    nonblock: false,
+    noatime: false,
+    noctty: false,
+    nofollow: false,
+    nolinks: false,
+    binary: false,
+    text: false,
+    fullblock: false,
+    count_bytes: false,
+    skip_bytes: false,
+};
+
+const DEFAULT_OFLAGS: OFlags = OFlags {
+    append: false,
+    cio: false,
+    direct: false,
+    directory: false,
+    dsync: false,
+    sync: false,
+    nocache: false,
+    nonblock: false,
+    noatime: false,
+    noctty: false,
+    nofollow: false,
+    nolinks: false,
+    binary: false,
+    text: false,
+    seek_bytes: false,
+};
+
+#[macro_export]
+macro_rules! icf (
+    () =>
+    {
+        icf!(None)
+    };
+    ( $ctable:expr ) =>
+    {
+        IConvFlags {
+            ctable: $ctable,
+            block: None,
+            unblock: None,
+            swab: false,
+            sync: false,
+            noerror: false,
+        }
+    };
+);
+
+#[macro_export]
+macro_rules! make_spec_test (
+    ( $test_id:ident, $test_name:expr, $src:expr ) =>
+    {
+        // When spec not given, output should match input
+        make_spec_test!($test_id, $test_name, $src, $src);
+    };
+    ( $test_id:ident, $test_name:expr, $src:expr, $spec:expr ) =>
+    {
+        make_spec_test!($test_id,
+                        $test_name,
+                        Input {
+                            src: $src,
+                            non_ascii: false,
+                            ibs: 512,
+                            xfer_stats: StatusLevel::None,
+                            cflags: icf!(),
+                            iflags: DEFAULT_IFLAGS,
+                        },
+                        Output {
+                            dst: File::create(format!("./test-resources/FAILED-{}.test", $test_name)).unwrap(),
+                            obs: 512,
+                            cflags: DEFAULT_CFO,
+                            oflags: DEFAULT_OFLAGS,
+                        },
+                        $spec,
+                        format!("./test-resources/FAILED-{}.test", $test_name)
+        );
+    };
+    ( $test_id:ident, $test_name:expr, $i:expr, $o:expr, $spec:expr, $tmp_fname:expr ) =>
+    {
+        #[test]
+        fn $test_id()
+        {
+            dd_fileout($i,$o).unwrap();
+
+            let res = File::open($tmp_fname).unwrap();
+            let res = BufReader::new(res);
+
+            let spec = BufReader::new($spec);
+
+            for (b_res, b_spec) in res.bytes().zip(spec.bytes())
+            {
+                assert_eq!(b_res.unwrap(),
+                           b_spec.unwrap());
+            }
+
+            fs::remove_file($tmp_fname).unwrap();
+        }
+    };
+);
+
+#[macro_export]
+macro_rules! make_conv_test (
+    ( $test_id:ident, $test_name:expr, $src:expr, $ctable:expr, $spec:expr ) =>
+    {
+        make_spec_test!($test_id,
+                        $test_name,
+                        Input {
+                            src: $src,
+                            non_ascii: false,
+                            ibs: 512,
+                            xfer_stats: StatusLevel::None,
+                            cflags: icf!($ctable),
+                            iflags: DEFAULT_IFLAGS,
+                        },
+                        Output {
+                            dst: File::create(format!("./test-resources/FAILED-{}.test", $test_name)).unwrap(),
+                            obs: 512,
+                            cflags: DEFAULT_CFO,
+                            oflags: DEFAULT_OFLAGS,
+                        },
+                        $spec,
+                        format!("./test-resources/FAILED-{}.test", $test_name)
+        );
+    };
+);
+
+#[macro_export]
+macro_rules! make_icf_test (
+    ( $test_id:ident, $test_name:expr, $src:expr, $icf:expr, $spec:expr ) =>
+    {
+        make_spec_test!($test_id,
+                        $test_name,
+                        Input {
+                            src: $src,
+                            non_ascii: false,
+                            ibs: 512,
+                            xfer_stats: StatusLevel::None,
+                            cflags: $icf,
+                            iflags: DEFAULT_IFLAGS,
+                        },
+                        Output {
+                            dst: File::create(format!("./test-resources/FAILED-{}.test", $test_name)).unwrap(),
+                            obs: 512,
+                            cflags: DEFAULT_CFO,
+                            oflags: DEFAULT_OFLAGS,
+                        },
+                        $spec,
+                        format!("./test-resources/FAILED-{}.test", $test_name)
+        );
+    };
+);
+
+#[macro_export]
+macro_rules! make_block_test (
+    ( $test_id:ident, $test_name:expr, $src:expr, $block:expr, $spec:expr ) =>
+    {
+        make_spec_test!($test_id,
+                        $test_name,
+                        Input {
+                            src: $src,
+                            non_ascii: false,
+                            ibs: 512,
+                            xfer_stats: StatusLevel::None,
+                            cflags: IConvFlags {
+                                ctable: None,
+                                block: $block,
+                                unblock: None,
+                                swab: false,
+                                sync: false,
+                                noerror: false,
+                            },
+                            iflags: DEFAULT_IFLAGS,
+                        },
+                        Output {
+                            dst: File::create(format!("./test-resources/FAILED-{}.test", $test_name)).unwrap(),
+                            obs: 512,
+                            cflags: DEFAULT_CFO,
+                            oflags: DEFAULT_OFLAGS,
+                        },
+                        $spec,
+                        format!("./test-resources/FAILED-{}.test", $test_name)
+        );
+    };
+);
diff --git a/src/uu/dd/src/dd_unit_tests/sanity_tests.rs b/src/uu/dd/src/dd_unit_tests/sanity_tests.rs
new file mode 100644
index 000000000..b772d6a27
--- /dev/null
+++ b/src/uu/dd/src/dd_unit_tests/sanity_tests.rs
@@ -0,0 +1,25 @@
+use super::*;
+
+make_spec_test!(
+    zeros_4k_test,
+    "zeros-4k",
+    File::open("./test-resources/zeros-620f0b67a91f7f74151bc5be745b7110.test").unwrap()
+);
+
+make_spec_test!(
+    ones_4k_test,
+    "ones-4k",
+    File::open("./test-resources/ones-6ae59e64850377ee5470c854761551ea.test").unwrap()
+);
+
+make_spec_test!(
+    deadbeef_32k_test,
+    "deadbeef-32k",
+    File::open("./test-resources/deadbeef-18d99661a1de1fc9af21b0ec2cd67ba3.test").unwrap()
+);
+
+make_spec_test!(
+    random_73k_test,
+    "random-73k",
+    File::open("./test-resources/random-5828891cb1230748e146f34223bbd3b5.test").unwrap()
+);
diff --git a/src/uu/dd/src/parseargs.rs b/src/uu/dd/src/parseargs.rs
index 12bb1aa89..5af5d0cce 100644
--- a/src/uu/dd/src/parseargs.rs
+++ b/src/uu/dd/src/parseargs.rs
@@ -1,5 +1,5 @@
 #[cfg(test)]
-mod test;
+mod unit_tests;
 
 use crate::conversion_tables::*;
 use crate::{
@@ -12,7 +12,7 @@ use crate::{
 
 use std::error::Error;
 
-/// Parser Errors describe errors with input
+/// Parser Errors describe errors with parser input
 #[derive(Debug)]
 pub enum ParseError
 {
diff --git a/src/uu/dd/src/parseargs/test.rs b/src/uu/dd/src/parseargs/unit_tests.rs
similarity index 100%
rename from src/uu/dd/src/parseargs/test.rs
rename to src/uu/dd/src/parseargs/unit_tests.rs