More test refactoring & dep injection for tracker svc in app