Updates to tests to use an extended service mangaer for testing purposes