FIXUP - Free sub-array after adding it to samples.
WIP - test instances and units