* Resurrect a test * Fix a broken test * Pass in the initial identity * Make IdentityService easier to mock