cleaner mini test suite
cleaner tests + more node types in id handler