Proper initalization of service. Fix tests.