Working on better code coverage

Added a new test that gets us up to 80% coverage. Still a ways to go.