Move to unique_ptr, test addition, guarantees