diff --git a/bloclink/apps/pna/features/data/inputs.json b/bloclink/apps/pna/features/data/inputs.json
new file mode 100644
index 0000000000000000000000000000000000000000..e5e42eccea8043399838c0418132d3569f8c9400
--- /dev/null
+++ b/bloclink/apps/pna/features/data/inputs.json
@@ -0,0 +1,145 @@
+{
+    "buildingInfo": {
+        "building_id": "",
+        "firstName": "Jinalllll",
+        "lastName": "Soniiiii",
+        "email": "jinal@blocpower.io",
+        "phone": "333-333-2233",
+        "address": ["838888 PARK PLACE, BROOKLYN"],
+        "buildingSqFt": 3000,
+        "numberOfFloors": 3,
+        "unitInfo": {
+            "studio": 1,
+            "oneBedroom": 1,
+            "twoBedroom": 1,
+            "threeBedroom": 1,
+            "fourBedroom": 1,
+            "other": "other",
+            "numOfOther": 0
+        }
+    },
+    "remoteSurvey": {
+        "heatingSystem": {
+            "question_id": 1,
+            "question": "Heating System",
+            "answer_id": 3
+        },
+        "heatingFuelSource": {
+            "question_id": 2,
+            "question": "Heating Fuel Source",
+            "answer_id": 6
+        },
+        "DHWSameBoiler": {
+            "question_id": 3,
+            "question": "Is Domestic Hot Water (DHW) and heat prepared by the same boiler?",
+            "answer_id": 10
+        },
+        "ownerPayOwnElectricBill": {
+            "question_id": 16,
+            "question": "Do your tenants pay their own electricity bills?",
+            "answer_id": 9
+        },
+        "accessibleByStairwell": {
+            "question_id": 10,
+            "question": "Is the roof flat and easily accessible by a stairwell?",
+            "answer_id": 9
+        },
+        "meteredForElectricity": {
+            "question_id": 15,
+            "question": "Is the building direct metered for electricity (tenant pay ConEd bills)?",
+            "answer_id": 10
+        },
+        "ageOfHeatGenerateSystem": {
+            "question_id": 4,
+            "question": "Age of the heat generating system?",
+            "answer_id": 13
+        },
+        "tenantComplaintsWindows": {
+            "question_id": 14,
+            "question": "Any tenant complaints about drafty windows?",
+            "answer_id": 26
+        },
+        "stairwellsHeated": {
+            "question_id": 7,
+            "question": "Are the following building areas heated? (stairwells)",
+            "answer_id": 9
+        },
+        "hallwaysHeated": {
+            "question_id": 6,
+            "question": "Are the following building areas heated? (hallways)",
+            "answer_id": 10
+        },
+        "basementHeated": {
+            "question_id": 8,
+            "question": "Are the following building areas heated? (basement)",
+            "answer_id": 9
+        },
+        "tenantComplaintsComfort": {
+            "question_id": 13,
+            "question": "Any tenant complaints about comfort issues? (Temperature)",
+            "answer_id": 23
+        },
+        "planToReplaceHS": {
+            "question_id": 5,
+            "question":  "When do you plan to replace the heating system?",
+            "answer_id": 16
+        },
+        "backFacadeAttached": {
+            "question_id": 11,
+            "question": "Is the back facade of your building attached to an adjacent building or structure?",
+            "answer_id": 10
+        },
+        "exteriorWallsAttached": {
+            "question_id": 12,
+            "question": "Are the exterior walls of your building attached to an adjacent building or structure?",
+            "answer_id": 10
+        },
+        "floorsHeated": {
+            "question_id": 9,
+            "question": "Are the following building areas heated? (floors)",
+            "answer_id": 9
+        },
+        "numberOfHeatingViolations": {
+            "question_id": 23,
+            "question": "Number of heating violations in 5 years?",
+            "answer_id": 45
+        }
+    },
+    "financialInitials": {
+        "bankruptcyPast": {
+            "question_id": 17,
+            "question": "Any bankruptcy in the past three years?",
+            "answer_id": 10
+        },
+        "currentOnEnergyBills": {
+            "question_id": 18,
+            "question": "Current on energy bills?",
+            "answer_id": 30
+        },
+        "currentMortgageBalance": {
+            "question_id": 19,
+            "question": "What is the current outstanding balance of the mortgage?",
+            "answer_id": 34
+        },
+        "profitable": {
+            "question_id": 20,
+            "question": "Is your building currently profitable?",
+            "answer_id": 40
+        },
+        "budgetForDownPayment": {
+            "question_id": 21,
+            "question": "What is your current budget for a down payment?",
+            "answer_id": 41
+        },
+        "legalOwnership": {
+            "question_id": 22,
+            "question": "Legal Ownership",
+            "answer_id": 53
+        },
+        "numberOfDobViolations": {
+            "question_id": 24,
+            "question": "Number of DOB violations?",
+            "answer_id": 48
+        }
+    }
+}
diff --git a/bloclink/apps/pna/features/data/questionnaire_data.non_exist_building.json b/bloclink/apps/pna/features/data/questionnaire_data.non_exist_building.json
deleted file mode 100644
index 331068c3b941f3a01de1ed78a13e805be8ee3fb0..0000000000000000000000000000000000000000
--- a/bloclink/apps/pna/features/data/questionnaire_data.non_exist_building.json
+++ /dev/null
@@ -1,147 +0,0 @@
-[
-    {
-        "buildingInfo": {
-            "building_id": "",
-            "firstName": "Jinalllll",
-            "lastName": "Soniiiii",
-            "email": "jinal@blocpower.io",
-            "phone": "333-333-2233",
-            "address": ["838888 PARK PLACE, BROOKLYN"],
-            "buildingSqFt": 3000,
-            "numberOfFloors": 3,
-            "unitInfo": {
-                "studio": 1,
-                "oneBedroom": 1,
-                "twoBedroom": 1,
-                "threeBedroom": 1,
-                "fourBedroom": 1,
-                "other": "other",
-                "numOfOther": 0
-            }
-        },
-        "remoteSurvey": {
-            "heatingSystem": {
-                "question_id": 1,
-                "question": "Heating System",
-                "answer_id": 3
-            },
-            "heatingFuelSource": {
-                "question_id": 2,
-                "question": "Heating Fuel Source",
-                "answer_id": 6
-            },
-            "DHWSameBoiler": {
-                "question_id": 3,
-                "question": "Is Domestic Hot Water (DHW) and heat prepared by the same boiler?",
-                "answer_id": 10
-            },
-            "ownerPayOwnElectricBill": {
-                "question_id": 16,
-                "question": "Do your tenants pay their own electricity bills?",
-                "answer_id": 9
-            },
-            "accessibleByStairwell": {
-                "question_id": 10,
-                "question": "Is the roof flat and easily accessible by a stairwell?",
-                "answer_id": 9
-            },
-            "meteredForElectricity": {
-                "question_id": 15,
-                "question": "Is the building direct metered for electricity (tenant pay ConEd bills)?",
-                "answer_id": 10
-            },
-            "ageOfHeatGenerateSystem": {
-                "question_id": 4,
-                "question": "Age of the heat generating system?",
-                "answer_id": 13
-            },
-            "tenantComplaintsWindows": {
-                "question_id": 14,
-                "question": "Any tenant complaints about drafty windows?",
-                "answer_id": 26
-            },
-            "stairwellsHeated": {
-                "question_id": 7,
-                "question": "Are the following building areas heated? (stairwells)",
-                "answer_id": 9
-            },
-            "hallwaysHeated": {
-                "question_id": 6,
-                "question": "Are the following building areas heated? (hallways)",
-                "answer_id": 10
-            },
-            "basementHeated": {
-                "question_id": 8,
-                "question": "Are the following building areas heated? (basement)",
-                "answer_id": 9
-            },
-            "tenantComplaintsComfort": {
-                "question_id": 13,
-                "question": "Any tenant complaints about comfort issues? (Temperature)",
-                "answer_id": 23
-            },
-            "planToReplaceHS": {
-                "question_id": 5,
-                "question":  "When do you plan to replace the heating system?",
-                "answer_id": 16
-            },
-            "backFacadeAttached": {
-                "question_id": 11,
-                "question": "Is the back facade of your building attached to an adjacent building or structure?",
-                "answer_id": 10
-            },
-            "exteriorWallsAttached": {
-                "question_id": 12,
-                "question": "Are the exterior walls of your building attached to an adjacent building or structure?",
-                "answer_id": 10
-            },
-            "floorsHeated": {
-                "question_id": 9,
-                "question": "Are the following building areas heated? (floors)",
-                "answer_id": 9
-            },
-            "numberOfHeatingViolations": {
-                "question_id": 23,
-                "question": "Number of heating violations in 5 years?",
-                "answer_id": 45
-            }
-        },
-        "financialInitials": {
-            "bankruptcyPast": {
-                "question_id": 17,
-                "question": "Any bankruptcy in the past three years?",
-                "answer_id": 10
-            },
-            "currentOnEnergyBills": {
-                "question_id": 18,
-                "question": "Current on energy bills?",
-                "answer_id": 30
-            },
-            "currentMortgageBalance": {
-                "question_id": 19,
-                "question": "What is the current outstanding balance of the mortgage?",
-                "answer_id": 34
-            },
-            "profitable": {
-                "question_id": 20,
-                "question": "Is your building currently profitable?",
-                "answer_id": 40
-            },
-            "budgetForDownPayment": {
-                "question_id": 21,
-                "question": "What is your current budget for a down payment?",
-                "answer_id": 41
-            },
-            "legalOwnership": {
-                "question_id": 22,
-                "question": "Legal Ownership",
-                "answer_id": 53
-            },
-            "numberOfDobViolations": {
-                "question_id": 24,
-                "question": "Number of DOB violations?",
-                "answer_id": 48
-            }
-        }
-    }
-]
diff --git a/bloclink/apps/pna/features/data/questionnaire_data_default.json b/bloclink/apps/pna/features/data/questionnaire_data_default.json
deleted file mode 100644
index bac05b3a55e8c1f4c19a549707db41a73d4d2fb0..0000000000000000000000000000000000000000
--- a/bloclink/apps/pna/features/data/questionnaire_data_default.json
+++ /dev/null
@@ -1,147 +0,0 @@
-[
-    {
-        "buildingInfo": {
-            "building_id": "",
-            "firstName": "",
-            "lastName": "",
-            "email": "",
-            "phone": "",
-            "address": "",
-            "buildingSqFt": "",
-            "numberOfFloors": "",
-            "unitInfo": {
-                "studio": "",
-                "oneBedroom": "",
-                "twoBedroom": "",
-                "threeBedroom": "",
-                "fourBedroom": "",
-                "other": "",
-                "numOfOther": ""
-            }
-        },
-        "remoteSurvey": {
-            "heatingSystem": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "heatingFuelSource": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "DHWSameBoiler": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "ownerPayOwnElectricBill": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "accessibleByStairwell": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "meteredForElectricity": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "ageOfHeatGenerateSystem": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "tenantComplaintsWindows": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "stairwellsHeated": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "hallwaysHeated": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "basementHeated": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "tenantComplaintsComfort": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "planToReplaceHS": {
-                "question_id": "",
-                "question":  "",
-                "answer_id": ""
-            },
-            "backFacadeAttached": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "exteriorWallsAttached": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "floorsHeated": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "numberOfHeatingViolations": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            }
-        },
-        "financialInitials": {
-            "bankruptcyPast": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "currentOnEnergyBills": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "currentMortgageBalance": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "profitable": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "budgetForDownPayment": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "legalOwnership": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "numberOfDobViolations": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            }
-        }
-    }
-]
diff --git a/bloclink/apps/pna/features/environment.py b/bloclink/apps/pna/features/environment.py
index a9bc8ded1235b0d99554484ead63caa8aa94c8f4..419fefd5f76164a68bcad6f476494e813919e41b 100644
--- a/bloclink/apps/pna/features/environment.py
+++ b/bloclink/apps/pna/features/environment.py
@@ -9,17 +9,18 @@ import requests
 
 @fixture
 def load_questionnaire_inputs(context):
-    with open('features/data/questionnaire_data.non_exist_building.json', 'r') as outfile:
-        context.inputs = json.load(outfile)[0]
+    with open('features/data/inputs.json', 'r') as outfile:
+        context.inputs = json.load(outfile)
 
 def before_tag(context, tag):
-    if tag == "load_questionnaire_inputs":
+    if tag == "load.questionnaire.inputs":
         use_fixture(load_questionnaire_inputs, context)
 
 def before_all(context):
     prefix = 'http://' if config('ENVIRONMENT') == 'local' else 'https://'
     context.basePath = prefix + config('DOMAIN') + '/buildings/'
     context.endpoints = {
+        'loadQuestionnaire' : '/pna/questionnaire/',
         'submitQuestionnaire' : '/pna/questionnaire/',
         'generateReport' : '/pna/report/generate/',
         'downloadReport' : '/pna/report/download/',
diff --git a/bloclink/apps/pna/features/questionnaire.feature b/bloclink/apps/pna/features/questionnaire.feature
new file mode 100644
index 0000000000000000000000000000000000000000..b3db78295601b68fdc515856f01a78e65bdcd2c6
--- /dev/null
+++ b/bloclink/apps/pna/features/questionnaire.feature
@@ -0,0 +1,33 @@
+Feature: User can load and submit questionnaire
+
+  Scenario Outline: User can load questionnaire
+      Given I have the building <buildingId>
+      When I load the questionnaire in Dashboard
+      Then load result page should contain <button> button
+
+      Examples: User has not submitted questionnaire
+        | buildingId | button |
+        | 12346 | submit |
+
+      Examples: User has submitted questionnaire, not calculated the report
+        | buildingId | button |
+        | 12345 | generate |
+
+      Examples: User has submitted questionnaire, and calculated the report
+        | buildingId | button |
+        | 54321 | download |
+
+  @load.questionnaire.inputs
+  Scenario Outline: User can submit questionnaire
+      Given I have the building <buildingId>
+      When I click submit button in Dashboard
+      Then submit result page should contain <button> button
+
+      Examples: Building has invalid inputs
+        | buildingId | button |
+        | 152699 | submit |
+
+      Examples: Building has valid inputs
+        | buildingId | button |
+        | 54321 | submit |
+        | 181794 | generate |
diff --git a/bloclink/apps/pna/features/report.feature b/bloclink/apps/pna/features/report.feature
new file mode 100644
index 0000000000000000000000000000000000000000..8483515df8b3a968f49056401950a8aa5c56c4fe
--- /dev/null
+++ b/bloclink/apps/pna/features/report.feature
@@ -0,0 +1,29 @@
+Feature: User can generate and download report
+
+  Scenario Outline: User can generate report
+      Given I have the building <buildingId>
+      When I click generate button in Dashboard
+      Then report should <result>
+
+      Examples: Building has invalid inputs
+        | buildingId | result |
+        | 54321 | fail |
+        | 152699 | fail |
+
+      Examples: Building has valid inputs
+        | buildingId | result |
+        | 181794 | succeed |
+
+  Scenario Outline: User can download report
+      Given I have the building <buildingId>
+      When I click download button in Dashboard
+      Then report should <result>
+
+      Examples: Building has invalid inputs
+        | buildingId | fail |
+        | 181794 | fail |
+
+      Examples: Building has valid inputs
+        | buildingId | result |
+        | 54321 | succeed |
+        | 152699 | succeed |
diff --git a/bloclink/apps/pna/features/steps/submitQuestionnaire.py b/bloclink/apps/pna/features/steps/questionnaire.py
similarity index 54%
rename from bloclink/apps/pna/features/steps/submitQuestionnaire.py
rename to bloclink/apps/pna/features/steps/questionnaire.py
index 1f46daec532e89667a91859d929555eb7edafb14..82d4169c473cefe0d3c533135ee6688962c77494 100644
--- a/bloclink/apps/pna/features/steps/submitQuestionnaire.py
+++ b/bloclink/apps/pna/features/steps/questionnaire.py
@@ -7,26 +7,35 @@ import json
 def step_impl(context, buildingId):
     context.buildingId = buildingId
 
-@when('I load the questionnaire')
+@when('I load the questionnaire in Dashboard')
 def step_impl(context):
-    response = requests.get(url=context.basePath+context.buildingId+context.endpoints['submitQuestionnaire'])
+    response = requests.get(url=context.basePath+context.buildingId+context.endpoints['loadQuestionnaire'])
     context.code = str(response.status_code)
     try:
         response_obj = json.loads(response.text)
         context.submitted = str(response_obj['submitted'])
         context.calculated = str(response_obj['calculated'])
-        context.fieldnames = response_obj.keys()
     except:
         context.submitted = "False"
         context.calculated = "False"
-        context.fieldnames = []
 
-    try:
-        context.success = str(response_obj['success'])
-    except:
-        context.success = 'True'
+@then('load result page should contain {button} button')
+def step_impl(context, button):
+    assert context.code == "200"
 
-@when('I click the submit button')
+    if button == 'submit':
+        assert context.submitted == "False"
+        assert context.calculated == "False"
+
+    if button == 'generate':
+        assert context.submitted == "True"
+        assert context.calculated == "False"
+
+    if button == 'download':
+        assert context.submitted == "True"
+        assert context.calculated == "True"
+
+@when('I click submit button in Dashboard')
 def step_impl(context):
     # Fill out building ID
     buildingInfo = context.inputs['buildingInfo']
@@ -42,23 +51,14 @@ def step_impl(context):
         context.success = "False"
         context.fieldnames = []
 
-@then('result should include code {code}')
-def step_impl(context, code):
-    assert code == context.code
-
-@then('result should include success as {success}')
-def step_impl(context, success):
-    assert success == context.success
-
-@then('result should include field names {fieldnames}')
-def step_impl(context, fieldnames):
-    for fieldname in fieldnames.split(','):
-        assert fieldname in context.fieldnames
+@then('submit result page should contain {button} button')
+def step_impl(context, button):
+    assert context.code == "200"
 
-@then('result should include submitted field as {submitted}')
-def step_impl(context, submitted):
-    assert submitted == context.submitted
+    if button == 'submit':
+        assert context.success == "False"
+        assert context.fieldnames == []
 
-@then('result should include calculated field as {calculated}')
-def step_impl(context, calculated):
-    assert submitted == context.calculated
+    if button == 'generate':
+        assert context.success == "True"
+        assert context.fieldnames != []
diff --git a/bloclink/apps/pna/features/steps/report.py b/bloclink/apps/pna/features/steps/report.py
new file mode 100644
index 0000000000000000000000000000000000000000..e62e22ae2fe4179c55cfe60b60ac6e7de1853e24
--- /dev/null
+++ b/bloclink/apps/pna/features/steps/report.py
@@ -0,0 +1,41 @@
+from behave import *
+import requests
+import json
+
+
+@when('I click generate button in Dashboard')
+def step_impl(context):
+    response = requests.get(url=context.basePath+context.buildingId+context.endpoints['generateReport'])
+    context.code = str(response.status_code)
+    try:
+        response_obj = json.loads(response.text)
+        context.success = str(response_obj['success'])
+        context.fieldnames = response_obj.keys()
+    except:
+        context.success = "False"
+        context.fieldnames = []
+
+@when('I click download button in Dashboard')
+def step_impl(context):
+    print(context.basePath+context.buildingId+context.endpoints['downloadReport'])
+    response = requests.get(url=context.basePath+context.buildingId+context.endpoints['downloadReport'])
+    context.code = str(response.status_code)
+    try:
+        response_obj = json.loads(response.text)
+        context.success = str(response_obj['success'])
+        context.fieldnames = response_obj.keys()
+    except:
+        context.success = "False"
+        context.fieldnames = []
+
+@then('report should {result}')
+def step_impl(context, result):
+    if result == 'succeed':
+        assert context.code == "200"
+        assert context.success == "True"
+        assert context.fieldnames != []
+
+    if result == 'fail':
+        assert context.success == "False"
+        assert context.fieldnames == []
+
diff --git a/bloclink/apps/pna/features/submitQuestionnaire.feature b/bloclink/apps/pna/features/submitQuestionnaire.feature
deleted file mode 100644
index 9168430ad97b1f820a9bb7a36f48bbf6627302f5..0000000000000000000000000000000000000000
--- a/bloclink/apps/pna/features/submitQuestionnaire.feature
+++ /dev/null
@@ -1,50 +0,0 @@
-Feature: A building owner can submit questionnaire
-
-  Scenario Outline: User can load questionnaire
-      Given I have the building <buildingId>
-      When I load the questionnaire
-      Then result should include code <code>
-      And result should include field names <fieldNames>
-      And result should include submitted field as <submitted>
-
-      Examples: Building not exist
-        | buildingId | code |
-        | 16998888 | 500 |
-
-      Examples: Building has no questionnaire submitted
-        | buildingId | code | fieldNames | submitted |
-        | 152699 | 200 | buildingInfo,submittedAnswers,answers,submitted,calculated | False |
-
-      Examples: Building has questionnaire submitted
-        | buildingId | code | fieldNames | submitted |
-        | 54321 | 200 | buildingInfo,submittedAnswers,answers,submitted,calculated | False |
-        | 181794 | 200 | buildingInfo,submittedAnswers,answers,submitted,calculated | True |
-
-      Examples: Building report has not calculated
-        | buildingId | code | fieldNames | submitted | calculated |
-        | 54321 | 200 | buildingInfo,submittedAnswers,answers,submitted,calculated | False | False |
-
-      Examples: Building report has calculated
-        | buildingId | code | fieldNames | submitted | calculated |
-        | 54321 | 200 | buildingInfo,submittedAnswers,answers,submitted,calculated | False | True |
-
-  @load_questionnaire_inputs
-  Scenario Outline: User can submit questionnaire
-      Given I have the building <buildingId>
-      When I click the submit button
-      Then result should include code <code>
-      And result should include success as <success>
-      And result should include field names <fieldNames>
-
-      Examples: Building not exist
-        | buildingId | code | fieldNames | success |
-        | 1699888 | 500 |  | False |
-
-      Examples: Building has no questionnaire submitted
-        | buildingId | code | fieldNames | success |
-        | 54321 | 200 | message,answers | True |
-        | 152699 | 200 | message,answers | True |
-
-      Examples: Building has questionnaire submitted
-        | buildingId | code | fieldNames | success |
-        | 181794 | 200 | message,answers | True |