Service and unit test updates