Fix task 3
Fixup
Add task 3 tests