refactoring - adding junit coverage