Service lacks test coverage

[Kaustubh-cribl]

Service has very minimal test coverage which causes few bugs to escape.

[wzdave]

good point, didn't think a more complete set was required, as it was mentioned to me that it should take around 4 hours.