Added a few tests to bolster code coverage and cleaned out some old, unused code.