Cleanup
Trying to get test coverage back to 100%