Followups to https://sbforge.org/fisheye/cru/CR-NEWSPAPER-236 .
Refactored to enable dependency injection + unit tests with mockito.