FIXUP MANIFEST
Tweaked tests
Renamed get_child_or_undef to get_child_maybe