Updated tests to use ServiceManager instead of Di