Add missing unit tests
Add type hints to service locator retrievals
Added type hints to functions and variables