Add test plan for task 1 and 4, plus some typo fix