Made tests compatible with service locator based dependency