Removed dead code. Improved code coverage
Refactoring. Moved helper methods to ServiceUtils