Fix identity tests

Jed, tests are passing except testIdentityEnabled which looks for a pref which might be deprecated at this point.  The test is commented out.