Revert deep merge, add many node attribute tests