Added service mocking to app