Increasing unit test coverage
Beginning code cleanup