Remove service locator dependency
More tests