Test Coverage Improvements

This is a small change centered around improving coverage of some of our existing code base.