improvements, work in progress: parent annotation, test for embedded
ids, existing test fixes