Fixing the test cases.
Merge pull request #479 from code-dot-org/feedback_collect

Fixing the test cases.
Merge pull request #480 from code-dot-org/finished

Finished to Delievered