DEVIDM-115: Fixed broken tests
DEVIDM-115: Tests for the mockService
DEVIDM-115: cleanup
Merge pull request #112 from iceglow/DEVIDM-115

DEVIDM-115: Tests