Updating unit tests to support new account identity