refactor unit tests into #[cfg(test)] mod tests {...}, cleaner and mo…

refactor unit tests into #[cfg(test)] mod tests {...}, cleaner and mo… #1018