Identity and node fixes and tests.