diff --git a/src/layouts/test.vue b/src/layouts/test.vue
index 9b3d1e27c..51a236485 100644
--- a/src/layouts/test.vue
+++ b/src/layouts/test.vue
@@ -5,7 +5,7 @@
 
     <button-question
       questionText="This is a question?"
-      :answers="sampleAnswers"
+      :answers="sampleCheckboxAnswers"
       :isMultiSelect="true"
       groupName="multiselect-test"
       v-model="selectedMultiselectValues"
@@ -16,7 +16,7 @@
 
     <button-question
       questionText="This is another question?"
-      :answers="sampleAnswers"
+      :answers="sampleRadioAnswers"
       :isMultiSelect="false"
       groupName="radio-test"
       v-model="selectedRadioValue"
@@ -51,7 +51,21 @@ export default {
   name: "test",
   data() {
     return {
-      sampleAnswers: [
+      sampleCheckboxAnswers: [
+        {
+          Text: "Part 1",
+          Name: "PART1",
+        },
+        {
+          Text: "Part 2",
+          Name: "PART2",
+        },
+        {
+          Text: "Part 3",
+          Name: "PART3",
+        },
+      ],
+      sampleRadioAnswers: [
         {
           Text: "Part 1",
           Name: "PART1",
diff --git a/src/mixins/button-mixin.js b/src/mixins/button-mixin.js
index 22ed53d5b..9b0bd138f 100644
--- a/src/mixins/button-mixin.js
+++ b/src/mixins/button-mixin.js
@@ -57,7 +57,7 @@ export default {
 
         valueToEmit = newValue;
       } else {
-        valueToEmit = isChecked;
+        valueToEmit = this.value;
       }
 
       console.log("ButtonWrapper is emitting: ", valueToEmit);
@@ -76,7 +76,7 @@ export default {
       return this.isMultiSelect ? "checkbox" : "radio";
     },
     buttonId() {
-      return JSON.stringify(this.value);
+      return `${this.groupName} ${JSON.stringify(this.value)}`;
     },
   },
 };