Fixed error with module name; moved tests into test modules with #[cfg(test)] directives