diff --git a/app/components/new-signup/checkbox.hbs b/app/components/new-signup/checkbox.hbs
index 811e0a58..958d4990 100644
--- a/app/components/new-signup/checkbox.hbs
+++ b/app/components/new-signup/checkbox.hbs
@@ -7,7 +7,7 @@
       <input
         type='checkbox'
         name='developer'
-        checked={{@roles.developer}}
+        checked={{false}}
         {{on 'change' this.checkboxFieldChanged}}
         class='checkbox-input'
       />
@@ -17,7 +17,7 @@
       <input
         type='checkbox'
         name='designer'
-        checked={{@roles.designer}}
+        checked={{false}}
         {{on 'change' this.checkboxFieldChanged}}
         class='checkbox-input'
       />
@@ -27,7 +27,7 @@
       <input
         type='checkbox'
         name='mavens'
-        checked={{@roles.mavens}}
+        checked={{false}}
         {{on 'change' this.checkboxFieldChanged}}
         class='checkbox-input'
       />
@@ -37,7 +37,7 @@
       <input
         type='checkbox'
         name='productmanager'
-        checked={{@roles.productmanager}}
+        checked={{false}}
         {{on 'change' this.checkboxFieldChanged}}
         class='checkbox-input'
       />
diff --git a/tests/integration/components/new-signup/select-test.js b/tests/integration/components/new-signup/checkbox-test.js
similarity index 66%
rename from tests/integration/components/new-signup/select-test.js
rename to tests/integration/components/new-signup/checkbox-test.js
index 97f3276f..06d62e2a 100644
--- a/tests/integration/components/new-signup/select-test.js
+++ b/tests/integration/components/new-signup/checkbox-test.js
@@ -19,7 +19,7 @@ module('Integration | Component | new-sign-up/form', function (hooks) {
     });
 
     await render(hbs`
-      <NewSignup::Select
+      <NewSignup::Checkbox
         @onClick={{this.onClick}} 
         @currentStep={{this.currentStep}}
         @dev={{this.dev}}
@@ -39,7 +39,7 @@ module('Integration | Component | new-sign-up/form', function (hooks) {
     });
 
     await render(hbs`
-      <NewSignup::Select
+      <NewSignup::Checkbox
         @onClick={{this.onClick}} 
         @currentStep={{this.currentStep}}
         @dev={{this.dev}}
@@ -49,8 +49,8 @@ module('Integration | Component | new-sign-up/form', function (hooks) {
     assert.dom('[data-test-btn="signup"]').hasText('Submit');
   });
 
-  test('It should have select field(currently behind dev flag)', async function (assert) {
-    assert.expect(3);
+  test('It should have label and checkbox(currently behind dev flag)', async function (assert) {
+    assert.expect(10);
 
     this.setProperties({
       onClick: function () {
@@ -61,16 +61,23 @@ module('Integration | Component | new-sign-up/form', function (hooks) {
     });
 
     await render(hbs`
-      <NewSignup::Select
+      <NewSignup::Checkbox
         @onClick={{this.onClick}} 
         @currentStep={{this.currentStep}}
         @dev={{this.dev}}
       />`);
 
-    assert.dom('[data-test-signup-form-select]').exists();
-    assert
-      .dom('[data-test-signup-form-select]')
-      .hasAttribute('name', 'role')
-      .hasAttribute('id', 'role');
+    assert.dom('.checkbox-label').exists({ count: 4 });
+    assert.dom('.checkbox-input').exists({ count: 4 });
+
+    assert.dom('.checkbox-input[name="developer"]').isNotChecked();
+    assert.dom('.checkbox-input[name="designer"]').isNotChecked();
+    assert.dom('.checkbox-input[name="mavens"]').isNotChecked();
+    assert.dom('.checkbox-input[name="productmanager"]').isNotChecked();
+
+    assert.dom('.checkbox-label:nth-child(1)').hasText('Developer');
+    assert.dom('.checkbox-label:nth-child(2)').hasText('Designer');
+    assert.dom('.checkbox-label:nth-child(3)').hasText('Mavens');
+    assert.dom('.checkbox-label:nth-child(4)').hasText('Product Manager');
   });
 });
diff --git a/tests/unit/controllers/new-signup-test.js b/tests/unit/controllers/new-signup-test.js
index f8d769a7..6c3a6411 100644
--- a/tests/unit/controllers/new-signup-test.js
+++ b/tests/unit/controllers/new-signup-test.js
@@ -85,15 +85,25 @@ module('Unit | Controller | new-signup', function (hooks) {
       'vinayak',
       'username value updated'
     );
+  });
+
+  test('testing handleCheckboxInput change function', function (assert) {
+    let controller = this.owner.lookup('controller:new-signup');
+    let developer = 'developer';
+    let designer = 'designer';
+    let mavens = 'mavens';
+    let productmanager = 'productmanager';
 
-    controller.send('handleInputChange', 'role', 'developer');
-    assert.equal(controller.developer, true, 'developer set to true');
+    controller.send('handleCheckboxInputChange', 'developer', true);
+    assert.equal(controller.roles[developer], true);
 
-    assert.equal(controller.designer, false, 'designer set to false');
+    controller.send('handleCheckboxInputChange', 'designer', true);
+    assert.equal(controller.roles[designer], true);
 
-    controller.send('handleInputChange', 'role', 'designer');
-    assert.equal(controller.designer, true, 'designer set to true');
+    controller.send('handleCheckboxInputChange', 'mavens', true);
+    assert.equal(controller.roles[mavens], true);
 
-    assert.equal(controller.developer, false, 'developer set to false');
+    controller.send('handleCheckboxInputChange', 'productmanager', true);
+    assert.equal(controller.roles[productmanager], true);
   });
 });