Convert integration unit tests to true unit tests  

Related to #60. Unit tests that are really integration tests need to be copied to a file under the tests folder. Replacements unit tests should be written that are true unit tests (no external file use), while maintaining current test coverage.