* Use jest mock extended for unit test service mocks * Replace substitute with mock * Fix merge issues