Adding additional services, and updating test case.