Added multiple node types, refined test data creation.