The test assumed a certain node would always be present. Now the test figures out what id to use. Also fix broken clustrix -> xpand renaming.