diff --git a/buffet/commands/command_instance_unittest.cc b/buffet/commands/command_instance_unittest.cc
index ace0738..844ac92 100644
--- a/buffet/commands/command_instance_unittest.cc
+++ b/buffet/commands/command_instance_unittest.cc
@@ -69,6 +69,7 @@
   params.insert(std::make_pair("volume", int_prop.CreateValue(100)));
   buffet::CommandInstance instance("robot._beep", "robotd", params);
 
+  EXPECT_EQ("", instance.GetID());
   EXPECT_EQ("robot._beep", instance.GetName());
   EXPECT_EQ("robotd", instance.GetCategory());
   EXPECT_EQ(params, instance.GetParameters());
@@ -78,6 +79,12 @@
   EXPECT_EQ(nullptr, instance.FindParameter("blah").get());
 }
 
+TEST(CommandInstance, SetID) {
+  buffet::CommandInstance instance("robot._beep", "robotd", {});
+  instance.SetID("command_id");
+  EXPECT_EQ("command_id", instance.GetID());
+}
+
 TEST_F(CommandInstanceTest, FromJson) {
   auto json = CreateDictionaryValue(R"({
     'name': 'robot.jump',