ENGINE-1889 : Add more unit tests on existing services