Fix unit tests due to identity framework changes