Move meta info to node creation
More edge cases in tests