Update - Task.8
Update - Task.9
Add - Task.10 (asser tests for task 8&9)