Fixes for unit test fails

components/streams/src/builder.cpp

@@ -91,10 +91,12 @@ ftl::data::Frame &Builder::get(int64_t timestamp, size_t ix) {
 	auto fs = _get(timestamp);
 
 	if (ix >= fs->frames.size()) {
-		throw FTL_Error("Frame index out-of-bounds - " << ix << "(" << fs->frames.size() << ")");
-		//while (fs->frames.size() < size_) {
-		//	fs->frames.push_back(std::move(pool_->allocate(ftl::data::FrameID(fs->frameset(), + fs->frames.size()), fs->timestamp())));
-		//}
+		//throw FTL_Error("Frame index out-of-bounds - " << ix << "(" << fs->frames.size() << ")");
+
+		// FIXME: This is really dangerous
+		while (fs->frames.size() < size_) {
+			fs->frames.push_back(std::move(pool_->allocate(ftl::data::FrameID(fs->frameset(), + fs->frames.size()), fs->timestamp())));
+		}
 	}
 
 	//if (fs->frames.size() < size_) fs->frames.resize(size_);

components/structures/src/new_frame.cpp

@@ -243,6 +243,8 @@ void Frame::merge(Frame &f) {
 		d.status = ChannelStatus::VALID;
 		touch(x.first);
 	}
+	f.status_ = FrameStatus::RELEASED;
+	f.changed_.clear();
 }
 
 void Frame::moveTo(Frame &f) {