expanding unit test coverage
code cleanup